|
28 | 28 | #include "xtensor/generators/xbuilder.hpp" |
29 | 29 | #include "xtensor/generators/xrandom.hpp" |
30 | 30 | #include "xtensor/misc/xmanipulation.hpp" |
| 31 | +#include "xtensor/views/index_mapper.hpp" |
31 | 32 | #include "xtensor/views/xstrided_view.hpp" |
32 | 33 | #include "xtensor/views/xview.hpp" |
33 | | -#include "xtensor/views/index_mapper.hpp" |
34 | 34 |
|
35 | 35 | namespace xt |
36 | 36 | { |
@@ -152,42 +152,42 @@ namespace xt |
152 | 152 | std::copy(data.cbegin(), data.cend(), a.template begin<layout_type::row_major>()); |
153 | 153 |
|
154 | 154 | auto view1 = view(a, 1, range(1, 4)); |
155 | | - |
| 155 | + |
156 | 156 | index_mapper<decltype(view1)> mapper1; |
157 | | - |
| 157 | + |
158 | 158 | EXPECT_EQ(a(1, 1), mapper1.map(a, view1, 0)); |
159 | 159 | EXPECT_EQ(a(1, 2), mapper1.map(a, view1, 1)); |
160 | 160 | EXPECT_EQ(size_t(1), mapper1.dimension()); |
161 | 161 | //~ XT_EXPECT_ANY_THROW(mapper1.map_at(a, view1, 10)); |
162 | | - |
| 162 | + |
163 | 163 | auto view0 = view(a, 0, range(0, 3)); |
164 | 164 | index_mapper<decltype(view0)> mapper0; |
165 | | - |
| 165 | + |
166 | 166 | EXPECT_EQ(a(0, 0), mapper0.map(a, view0, 0)); |
167 | 167 | EXPECT_EQ(a(0, 1), mapper0.map(a, view0, 1)); |
168 | 168 | EXPECT_EQ(size_t(1), mapper0.dimension()); |
169 | | - |
| 169 | + |
170 | 170 | auto view2 = view(a, range(0, 2), 2); |
171 | 171 | index_mapper<decltype(view2)> mapper2; |
172 | 172 | EXPECT_EQ(a(0, 2), mapper2.map(a, view2, 0)); |
173 | 173 | EXPECT_EQ(a(1, 2), mapper2.map(a, view2, 1)); |
174 | 174 | EXPECT_EQ(size_t(1), mapper2.dimension()); |
175 | | - |
| 175 | + |
176 | 176 | //~ auto view4 = view(a, 1); |
177 | 177 | //~ index_mapper<decltype(view4)> mapper4; |
178 | 178 | //~ EXPECT_EQ(size_t(1), mapper4.dimension()); |
179 | | - //~ |
| 179 | + //~ |
180 | 180 | //~ auto view5 = view(view4, 1); |
181 | 181 | //~ index_mapper<decltype(view5)> mapper5; |
182 | 182 | //~ EXPECT_EQ(size_t(0), mapper5.dimension()); |
183 | | - |
| 183 | + |
184 | 184 | auto view6 = view(a, 1, all()); |
185 | 185 | index_mapper<decltype(view6)> mapper6; |
186 | 186 | EXPECT_EQ(a(1, 0), mapper6.map(a, view6, 0)); |
187 | 187 | EXPECT_EQ(a(1, 1), mapper6.map(a, view6, 1)); |
188 | 188 | EXPECT_EQ(a(1, 2), mapper6.map(a, view6, 2)); |
189 | 189 | EXPECT_EQ(a(1, 3), mapper6.map(a, view6, 3)); |
190 | | - |
| 190 | + |
191 | 191 | auto view7 = view(a, all(), 2); |
192 | 192 | index_mapper<decltype(view7)> mapper7; |
193 | 193 | EXPECT_EQ(a(0, 2), mapper7.map(a, view7, 0)); |
@@ -334,14 +334,13 @@ namespace xt |
334 | 334 |
|
335 | 335 | auto view1 = view(a, 1, all(), all()); |
336 | 336 | index_mapper<decltype(view1)> mapper1; |
337 | | - |
| 337 | + |
338 | 338 | EXPECT_EQ(size_t(2), mapper1.dimension()); |
339 | | - std::cout << "===================================" << std::endl; |
340 | 339 | EXPECT_EQ(a(1, 0, 0), mapper1.map(a, view1, 0, 0)); |
341 | 340 | EXPECT_EQ(a(1, 0, 1), mapper1.map(a, view1, 0, 1)); |
342 | | - //~ EXPECT_EQ(a(1, 1, 0), mapper1.map(a, view1, 1, 0)); |
343 | | - //~ EXPECT_EQ(a(1, 1, 1), mapper1.map(a, view1, 1, 1)); |
344 | | - //~ XT_EXPECT_ANY_THROW(mapper1.map_at(a, view1, 10, 10)); |
| 341 | + EXPECT_EQ(a(1, 1, 0), mapper1.map(a, view1, 1, 0)); |
| 342 | + EXPECT_EQ(a(1, 1, 1), mapper1.map(a, view1, 1, 1)); |
| 343 | + XT_EXPECT_ANY_THROW(mapper1.map_at(a, view1, 10, 10)); |
345 | 344 | } |
346 | 345 |
|
347 | 346 | TEST(xview, integral_count) |
|
0 commit comments