Skip to content

Commit dec6770

Browse files
gouaringouarin
committed
rename storage_begin, storage_end, ... by linear_*
1 parent f16249c commit dec6770

19 files changed

+150
-150
lines changed

‎benchmark/benchmark_adapter.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace xt
2222
const V a({1,2,3,4});
2323
const V b({1,2,3,4});
2424
using value_type = typename V::value_type;
25-
25+
2626
for (auto _ : state)
2727
{
2828
xtensor<value_type, 1> result(std::array<std::size_t, 1>({4}));
@@ -63,7 +63,7 @@ namespace xt
6363
auto ab = xt::adapt(b);
6464
auto ar = xt::adapt(res);
6565
auto fun = aa + ab;
66-
std::copy(fun.storage_cbegin(), fun.storage_cend(), ar.storage_begin());
66+
std::copy(fun.linear_cbegin(), fun.linear_cend(), ar.linear_begin());
6767
benchmark::DoNotOptimize(ar.data());
6868
}
6969
}
@@ -81,7 +81,7 @@ namespace xt
8181
auto ab = xt::adapt(b);
8282
auto ar = xt::adapt(res);
8383
auto fun = aa + ab;
84-
std::transform(fun.storage_cbegin(), fun.storage_cend(), ar.storage_begin(),
84+
std::transform(fun.linear_cbegin(), fun.linear_cend(), ar.linear_begin(),
8585
[](typename decltype(fun)::value_type x) { return static_cast<typename decltype(ar)::value_type>(x); });
8686
benchmark::DoNotOptimize(ar.data());
8787
}

‎benchmark/benchmark_assign.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ namespace xt
161161
for (auto _ : state)
162162
{
163163
auto fun = 3.0 * x - 2.0 * y;
164-
std::copy(fun.storage_cbegin(), fun.storage_cend(), res.storage_begin());
164+
std::copy(fun.linear_cbegin(), fun.linear_cend(), res.linear_begin());
165165
benchmark::DoNotOptimize(res.data());
166166
}
167167
}

‎benchmark/benchmark_math.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ namespace xt
9292
for (auto _ : state)
9393
{
9494
auto fct = f(lhs, rhs);
95-
std::copy(fct.storage_begin(), fct.storage_end(), res.storage_begin());
95+
std::copy(fct.linear_begin(), fct.linear_end(), res.linear_begin());
9696
benchmark::DoNotOptimize(res.data());
9797
}
9898
}

‎include/xtensor/xcontainer.hpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -189,13 +189,13 @@ namespace xt
189189
container_simd_return_type_t<storage_type, value_type, requested_type>
190190
/*simd_return_type<requested_type>*/ load_simd(size_type i) const;
191191

192-
linear_iterator storage_begin() noexcept;
193-
linear_iterator storage_end() noexcept;
192+
linear_iterator linear_begin() noexcept;
193+
linear_iterator linear_end() noexcept;
194194

195-
const_linear_iterator storage_begin() const noexcept;
196-
const_linear_iterator storage_end() const noexcept;
197-
const_linear_iterator storage_cbegin() const noexcept;
198-
const_linear_iterator storage_cend() const noexcept;
195+
const_linear_iterator linear_begin() const noexcept;
196+
const_linear_iterator linear_end() const noexcept;
197+
const_linear_iterator linear_cbegin() const noexcept;
198+
const_linear_iterator linear_cend() const noexcept;
199199

200200
reverse_linear_iterator storage_rbegin() noexcept;
201201
reverse_linear_iterator storage_rend() noexcept;
@@ -423,7 +423,7 @@ namespace xt
423423
template <class T>
424424
inline void xcontainer<D>::fill(const T& value)
425425
{
426-
std::fill(storage_begin(), storage_end(), value);
426+
std::fill(linear_begin(), linear_end(), value);
427427
}
428428

429429
/**
@@ -752,37 +752,37 @@ namespace xt
752752
}
753753

754754
template <class D>
755-
inline auto xcontainer<D>::storage_begin() noexcept -> linear_iterator
755+
inline auto xcontainer<D>::linear_begin() noexcept -> linear_iterator
756756
{
757757
return storage().begin();
758758
}
759759

760760
template <class D>
761-
inline auto xcontainer<D>::storage_end() noexcept -> linear_iterator
761+
inline auto xcontainer<D>::linear_end() noexcept -> linear_iterator
762762
{
763763
return storage().end();
764764
}
765765

766766
template <class D>
767-
inline auto xcontainer<D>::storage_begin() const noexcept -> const_linear_iterator
767+
inline auto xcontainer<D>::linear_begin() const noexcept -> const_linear_iterator
768768
{
769769
return storage().begin();
770770
}
771771

772772
template <class D>
773-
inline auto xcontainer<D>::storage_end() const noexcept -> const_linear_iterator
773+
inline auto xcontainer<D>::linear_end() const noexcept -> const_linear_iterator
774774
{
775775
return storage().cend();
776776
}
777777

778778
template <class D>
779-
inline auto xcontainer<D>::storage_cbegin() const noexcept -> const_linear_iterator
779+
inline auto xcontainer<D>::linear_cbegin() const noexcept -> const_linear_iterator
780780
{
781781
return storage().cbegin();
782782
}
783783

784784
template <class D>
785-
inline auto xcontainer<D>::storage_cend() const noexcept -> const_linear_iterator
785+
inline auto xcontainer<D>::linear_cend() const noexcept -> const_linear_iterator
786786
{
787787
return storage().cend();
788788
}

‎include/xtensor/xdynamic_view.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ namespace xt
499499
template <class T>
500500
inline void xdynamic_view<CT, S, L, FST>::fill(const T& value)
501501
{
502-
return std::fill(this->storage_begin(), this->storage_end(), value);
502+
return std::fill(this->linear_begin(), this->linear_end(), value);
503503
}
504504

505505
template <class CT, class S, layout_type L, class FST>

‎include/xtensor/xexpression.hpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -572,12 +572,12 @@ namespace xt
572572
XTENSOR_FORWARD_CONST_ITERATOR_METHOD(crbegin)
573573
XTENSOR_FORWARD_CONST_ITERATOR_METHOD(crend)
574574

575-
XTENSOR_FORWARD_METHOD(storage_begin)
576-
XTENSOR_FORWARD_METHOD(storage_end)
577-
XTENSOR_FORWARD_CONST_METHOD(storage_begin)
578-
XTENSOR_FORWARD_CONST_METHOD(storage_end)
579-
XTENSOR_FORWARD_CONST_METHOD(storage_cbegin)
580-
XTENSOR_FORWARD_CONST_METHOD(storage_cend)
575+
XTENSOR_FORWARD_METHOD(linear_begin)
576+
XTENSOR_FORWARD_METHOD(linear_end)
577+
XTENSOR_FORWARD_CONST_METHOD(linear_begin)
578+
XTENSOR_FORWARD_CONST_METHOD(linear_end)
579+
XTENSOR_FORWARD_CONST_METHOD(linear_cbegin)
580+
XTENSOR_FORWARD_CONST_METHOD(linear_cend)
581581

582582
XTENSOR_FORWARD_METHOD(storage_rbegin)
583583
XTENSOR_FORWARD_METHOD(storage_rend)

‎include/xtensor/xfunction.hpp‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -292,10 +292,10 @@ namespace xt
292292
using iterable_base::crbegin;
293293
using iterable_base::crend;
294294

295-
const_linear_iterator storage_begin() const noexcept;
296-
const_linear_iterator storage_end() const noexcept;
297-
const_linear_iterator storage_cbegin() const noexcept;
298-
const_linear_iterator storage_cend() const noexcept;
295+
const_linear_iterator linear_begin() const noexcept;
296+
const_linear_iterator linear_end() const noexcept;
297+
const_linear_iterator linear_cbegin() const noexcept;
298+
const_linear_iterator linear_cend() const noexcept;
299299

300300
const_reverse_linear_iterator storage_rbegin() const noexcept;
301301
const_reverse_linear_iterator storage_rend() const noexcept;
@@ -686,28 +686,28 @@ namespace xt
686686
//@}
687687

688688
template <class F, class... CT>
689-
inline auto xfunction<F, CT...>::storage_begin() const noexcept -> const_linear_iterator
689+
inline auto xfunction<F, CT...>::linear_begin() const noexcept -> const_linear_iterator
690690
{
691-
return storage_cbegin();
691+
return linear_cbegin();
692692
}
693693

694694
template <class F, class... CT>
695-
inline auto xfunction<F, CT...>::storage_end() const noexcept -> const_linear_iterator
695+
inline auto xfunction<F, CT...>::linear_end() const noexcept -> const_linear_iterator
696696
{
697-
return storage_cend();
697+
return linear_cend();
698698
}
699699

700700
template <class F, class... CT>
701-
inline auto xfunction<F, CT...>::storage_cbegin() const noexcept -> const_linear_iterator
701+
inline auto xfunction<F, CT...>::linear_cbegin() const noexcept -> const_linear_iterator
702702
{
703-
auto f = [](const auto& e) noexcept { return linear_begin(e); };
703+
auto f = [](const auto& e) noexcept { return xt::linear_begin(e); };
704704
return build_iterator(f, std::make_index_sequence<sizeof...(CT)>());
705705
}
706706

707707
template <class F, class... CT>
708-
inline auto xfunction<F, CT...>::storage_cend() const noexcept -> const_linear_iterator
708+
inline auto xfunction<F, CT...>::linear_cend() const noexcept -> const_linear_iterator
709709
{
710-
auto f = [](const auto& e) noexcept { return linear_end(e); };
710+
auto f = [](const auto& e) noexcept { return xt::linear_end(e); };
711711
return build_iterator(f, std::make_index_sequence<sizeof...(CT)>());
712712
}
713713

@@ -726,13 +726,13 @@ namespace xt
726726
template <class F, class... CT>
727727
inline auto xfunction<F, CT...>::storage_crbegin() const noexcept -> const_reverse_linear_iterator
728728
{
729-
return const_reverse_linear_iterator(storage_cend());
729+
return const_reverse_linear_iterator(linear_cend());
730730
}
731731

732732
template <class F, class... CT>
733733
inline auto xfunction<F, CT...>::storage_crend() const noexcept -> const_reverse_linear_iterator
734734
{
735-
return const_reverse_linear_iterator(storage_cbegin());
735+
return const_reverse_linear_iterator(linear_cbegin());
736736
}
737737

738738
template <class F, class... CT>

‎include/xtensor/xfunctor_view.hpp‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -293,13 +293,13 @@ namespace xt
293293
template <class S, layout_type L = XTENSOR_DEFAULT_TRAVERSAL>
294294
const_reverse_broadcast_iterator<S, L> crend(const S& shape) const noexcept;
295295

296-
linear_iterator storage_begin() noexcept;
297-
linear_iterator storage_end() noexcept;
296+
linear_iterator linear_begin() noexcept;
297+
linear_iterator linear_end() noexcept;
298298

299-
const_linear_iterator storage_begin() const noexcept;
300-
const_linear_iterator storage_end() const noexcept;
301-
const_linear_iterator storage_cbegin() const noexcept;
302-
const_linear_iterator storage_cend() const noexcept;
299+
const_linear_iterator linear_begin() const noexcept;
300+
const_linear_iterator linear_end() const noexcept;
301+
const_linear_iterator linear_cbegin() const noexcept;
302+
const_linear_iterator linear_cend() const noexcept;
303303

304304
reverse_linear_iterator storage_rbegin() noexcept;
305305
reverse_linear_iterator storage_rend() noexcept;
@@ -1221,39 +1221,39 @@ namespace xt
12211221
//@}
12221222

12231223
template <class D>
1224-
inline auto xfunctor_applier_base<D>::storage_begin() noexcept -> linear_iterator
1224+
inline auto xfunctor_applier_base<D>::linear_begin() noexcept -> linear_iterator
12251225
{
1226-
return linear_iterator(m_e.storage_begin(), &m_functor);
1226+
return linear_iterator(m_e.linear_begin(), &m_functor);
12271227
}
12281228

12291229
template <class D>
1230-
inline auto xfunctor_applier_base<D>::storage_end() noexcept -> linear_iterator
1230+
inline auto xfunctor_applier_base<D>::linear_end() noexcept -> linear_iterator
12311231
{
1232-
return linear_iterator(m_e.storage_end(), &m_functor);
1232+
return linear_iterator(m_e.linear_end(), &m_functor);
12331233
}
12341234

12351235
template <class D>
1236-
inline auto xfunctor_applier_base<D>::storage_begin() const noexcept -> const_linear_iterator
1236+
inline auto xfunctor_applier_base<D>::linear_begin() const noexcept -> const_linear_iterator
12371237
{
1238-
return const_linear_iterator(m_e.storage_begin(), &m_functor);
1238+
return const_linear_iterator(m_e.linear_begin(), &m_functor);
12391239
}
12401240

12411241
template <class D>
1242-
inline auto xfunctor_applier_base<D>::storage_end() const noexcept -> const_linear_iterator
1242+
inline auto xfunctor_applier_base<D>::linear_end() const noexcept -> const_linear_iterator
12431243
{
1244-
return const_linear_iterator(m_e.storage_end(), &m_functor);
1244+
return const_linear_iterator(m_e.linear_end(), &m_functor);
12451245
}
12461246

12471247
template <class D>
1248-
inline auto xfunctor_applier_base<D>::storage_cbegin() const noexcept -> const_linear_iterator
1248+
inline auto xfunctor_applier_base<D>::linear_cbegin() const noexcept -> const_linear_iterator
12491249
{
1250-
return const_linear_iterator(m_e.storage_cbegin(), &m_functor);
1250+
return const_linear_iterator(m_e.linear_cbegin(), &m_functor);
12511251
}
12521252

12531253
template <class D>
1254-
inline auto xfunctor_applier_base<D>::storage_cend() const noexcept -> const_linear_iterator
1254+
inline auto xfunctor_applier_base<D>::linear_cend() const noexcept -> const_linear_iterator
12551255
{
1256-
return const_linear_iterator(m_e.storage_cend(), &m_functor);
1256+
return const_linear_iterator(m_e.linear_cend(), &m_functor);
12571257
}
12581258

12591259
template <class D>
@@ -1397,7 +1397,7 @@ namespace xt
13971397

13981398
if (this->layout() == de.layout())
13991399
{
1400-
std::copy(de.storage_begin(), de.storage_end(), this->storage_begin());
1400+
std::copy(de.linear_begin(), de.linear_end(), this->linear_begin());
14011401
}
14021402
else
14031403
{

‎include/xtensor/xiterable.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -928,7 +928,7 @@ namespace xt
928928
{
929929
return xtl::mpl::static_if<L == static_layout>([&](auto self)
930930
{
931-
return self(*this).derived_cast().storage_begin();
931+
return self(*this).derived_cast().linear_begin();
932932
}, /*else*/ [&](auto self)
933933
{
934934
return self(*this).iterable_base::template begin<L>();
@@ -946,7 +946,7 @@ namespace xt
946946
{
947947
return xtl::mpl::static_if<L == static_layout>([&](auto self)
948948
{
949-
return self(*this).derived_cast().storage_end();
949+
return self(*this).derived_cast().linear_end();
950950
}, /*else*/ [&](auto self)
951951
{
952952
return self(*this).iterable_base::template end<L>();
@@ -986,7 +986,7 @@ namespace xt
986986
{
987987
return xtl::mpl::static_if<L == static_layout>([&](auto self)
988988
{
989-
return self(*this).derived_cast().storage_cbegin();
989+
return self(*this).derived_cast().linear_cbegin();
990990
}, /*else*/ [&](auto self)
991991
{
992992
return self(*this).iterable_base::template cbegin<L>();
@@ -1004,7 +1004,7 @@ namespace xt
10041004
{
10051005
return xtl::mpl::static_if<L == static_layout>([&](auto self)
10061006
{
1007-
return self(*this).derived_cast().storage_cend();
1007+
return self(*this).derived_cast().linear_cend();
10081008
}, /*else*/ [&](auto self)
10091009
{
10101010
return self(*this).iterable_base::template cend<L>();

‎include/xtensor/xiterator.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ namespace xt
428428
};
429429

430430
template <class C>
431-
struct has_linear_iterator<C, void_t<decltype(std::declval<C>().storage_cbegin())>>
431+
struct has_linear_iterator<C, void_t<decltype(std::declval<C>().linear_cbegin())>>
432432
: std::true_type
433433
{
434434
};
@@ -439,7 +439,7 @@ namespace xt
439439
{
440440
return xtl::mpl::static_if<detail::has_linear_iterator<C>::value>([&](auto self)
441441
{
442-
return self(c).storage_begin();
442+
return self(c).linear_begin();
443443
}, /*else*/ [&](auto self)
444444
{
445445
return self(c).begin();
@@ -451,7 +451,7 @@ namespace xt
451451
{
452452
return xtl::mpl::static_if<detail::has_linear_iterator<C>::value>([&](auto self)
453453
{
454-
return self(c).storage_end();
454+
return self(c).linear_end();
455455
}, /*else*/ [&](auto self)
456456
{
457457
return self(c).end();
@@ -463,7 +463,7 @@ namespace xt
463463
{
464464
return xtl::mpl::static_if<detail::has_linear_iterator<C>::value>([&](auto self)
465465
{
466-
return self(c).storage_cbegin();
466+
return self(c).linear_cbegin();
467467
}, /*else*/ [&](auto self)
468468
{
469469
return self(c).cbegin();
@@ -475,7 +475,7 @@ namespace xt
475475
{
476476
return xtl::mpl::static_if<detail::has_linear_iterator<C>::value>([&](auto self)
477477
{
478-
return self(c).storage_cend();
478+
return self(c).linear_cend();
479479
}, /*else*/ [&](auto self)
480480
{
481481
return self(c).cend();

0 commit comments

Comments
 (0)