boost_mirror/multi_array
1
0
Fork 0
mirror of https://github.com/boostorg/multi_array.git synced 2025-05-12 05:41:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17 from CromwellEnage/index_range_size

Browse Source 
index_range.size() was missing
This commit is contained in:
Glen Fernandes 2019-02-24 20:49:58 -05:00 committed by GitHub
commit f59629cebb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/boost/multi_array/index_range.hpp
View File

@ -107,6 +107,15 @@ namespace multi_array {
index stride() const { return stride_; } index stride() const { return stride_; }
size_type size(index idx) const
{
return (
(this->start_ == this_type::from_start()) || (
this->finish_ == this_type::to_end()
)
) ? idx : ((this->finish_ - this->start_) / this->stride_);
}
void set_index_range(index start, index finish, index stride=1) void set_index_range(index start, index finish, index stride=1)
{ {
start_ = start; start_ = start;

9
test/range1.cpp
View File

@ -33,6 +33,7 @@ main()
BOOST_TEST(r1.start() == -3); BOOST_TEST(r1.start() == -3);
BOOST_TEST(r1.finish() == 5); BOOST_TEST(r1.finish() == 5);
BOOST_TEST(r1.stride() == 1); BOOST_TEST(r1.stride() == 1);
BOOST_TEST(r1.size(0) == 8);
BOOST_TEST(!r1.is_degenerate()); BOOST_TEST(!r1.is_degenerate());
BOOST_TEST(r1.get_start(0) == -3); BOOST_TEST(r1.get_start(0) == -3);
BOOST_TEST(r1.get_finish(100) == 5); BOOST_TEST(r1.get_finish(100) == 5);
@ -43,6 +44,7 @@ main()
BOOST_TEST(r2.start() == -3); BOOST_TEST(r2.start() == -3);
BOOST_TEST(r2.finish() == 5); BOOST_TEST(r2.finish() == 5);
BOOST_TEST(r2.stride() == 2); BOOST_TEST(r2.stride() == 2);
BOOST_TEST(r2.size(0) == 4);
BOOST_TEST(!r2.is_degenerate()); BOOST_TEST(!r2.is_degenerate());
} }
@ -52,6 +54,7 @@ main()
BOOST_TEST(r3.start() == 5); BOOST_TEST(r3.start() == 5);
BOOST_TEST(r3.finish() == 6); BOOST_TEST(r3.finish() == 6);
BOOST_TEST(r3.stride() == 1); BOOST_TEST(r3.stride() == 1);
BOOST_TEST(r3.size(0) == 1);
BOOST_TEST(r3.is_degenerate()); BOOST_TEST(r3.is_degenerate());
} }
@ -61,6 +64,7 @@ main()
BOOST_TEST(r4.get_start(0) == 0); BOOST_TEST(r4.get_start(0) == 0);
BOOST_TEST(r4.get_finish(100) == 100); BOOST_TEST(r4.get_finish(100) == 100);
BOOST_TEST(r4.stride() == 1); BOOST_TEST(r4.stride() == 1);
BOOST_TEST(r4.size(0) == 0);
} }
{ {
@ -69,6 +73,7 @@ main()
BOOST_TEST(r5.start() == -3); BOOST_TEST(r5.start() == -3);
BOOST_TEST(r5.stride() == 2); BOOST_TEST(r5.stride() == 2);
BOOST_TEST(r5.finish() == 7); BOOST_TEST(r5.finish() == 7);
BOOST_TEST(r5.size(0) == 5);
} }
// try out all the comparison operators // try out all the comparison operators
@ -77,6 +82,7 @@ main()
BOOST_TEST(r6.start() == -3); BOOST_TEST(r6.start() == -3);
BOOST_TEST(r6.stride() == 2); BOOST_TEST(r6.stride() == 2);
BOOST_TEST(r6.finish() == 7); BOOST_TEST(r6.finish() == 7);
BOOST_TEST(r6.size(0) == 5);
} }
{ {
@ -84,6 +90,7 @@ main()
BOOST_TEST(r7.start() == -2); BOOST_TEST(r7.start() == -2);
BOOST_TEST(r7.stride() == 1); BOOST_TEST(r7.stride() == 1);
BOOST_TEST(r7.finish() == 8); BOOST_TEST(r7.finish() == 8);
BOOST_TEST(r7.size(0) == 10);
} }
// arithmetic operators // arithmetic operators
@ -92,6 +99,7 @@ main()
BOOST_TEST(r8.start() == 2); BOOST_TEST(r8.start() == 2);
BOOST_TEST(r8.stride() == 1); BOOST_TEST(r8.stride() == 1);
BOOST_TEST(r8.finish() == 7); BOOST_TEST(r8.finish() == 7);
BOOST_TEST(r8.size(0) == 5);
} }
{ {
@ -99,6 +107,7 @@ main()
BOOST_TEST(r9.start() == -2); BOOST_TEST(r9.start() == -2);
BOOST_TEST(r9.stride() == 1); BOOST_TEST(r9.stride() == 1);
BOOST_TEST(r9.finish() == 3); BOOST_TEST(r9.finish() == 3);
BOOST_TEST(r9.size(0) == 5);
} }
return boost::report_errors(); return boost::report_errors();