Skip to content

index_range.size() was missing #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
glenfe merged 2 commits into from
Feb 25, 2019
Merged

index_range.size() was missing #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17f9326
index_range.size() was missing
CromwellEnage Sep 19, 2018
55bba0e
Merge branch 'develop' into index_range_size
glenfe Feb 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions include/boost/multi_array/index_range.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,15 @@ namespace multi_array {

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)
{
start_ = start;
Expand Down
9 changes: 9 additions & 0 deletions test/range1.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ main()
BOOST_TEST(r1.start() == -3);
BOOST_TEST(r1.finish() == 5);
BOOST_TEST(r1.stride() == 1);
BOOST_TEST(r1.size(0) == 8);
BOOST_TEST(!r1.is_degenerate());
BOOST_TEST(r1.get_start(0) == -3);
BOOST_TEST(r1.get_finish(100) == 5);
Expand All @@ -43,6 +44,7 @@ main()
BOOST_TEST(r2.start() == -3);
BOOST_TEST(r2.finish() == 5);
BOOST_TEST(r2.stride() == 2);
BOOST_TEST(r2.size(0) == 4);
BOOST_TEST(!r2.is_degenerate());
}

Expand All @@ -52,6 +54,7 @@ main()
BOOST_TEST(r3.start() == 5);
BOOST_TEST(r3.finish() == 6);
BOOST_TEST(r3.stride() == 1);
BOOST_TEST(r3.size(0) == 1);
BOOST_TEST(r3.is_degenerate());
}

Expand All @@ -61,6 +64,7 @@ main()
BOOST_TEST(r4.get_start(0) == 0);
BOOST_TEST(r4.get_finish(100) == 100);
BOOST_TEST(r4.stride() == 1);
BOOST_TEST(r4.size(0) == 0);
}

{
Expand All @@ -69,6 +73,7 @@ main()
BOOST_TEST(r5.start() == -3);
BOOST_TEST(r5.stride() == 2);
BOOST_TEST(r5.finish() == 7);
BOOST_TEST(r5.size(0) == 5);
}

// try out all the comparison operators
Expand All @@ -77,13 +82,15 @@ main()
BOOST_TEST(r6.start() == -3);
BOOST_TEST(r6.stride() == 2);
BOOST_TEST(r6.finish() == 7);
BOOST_TEST(r6.size(0) == 5);
}

{
range r7 = -3 < range() <= 7;
BOOST_TEST(r7.start() == -2);
BOOST_TEST(r7.stride() == 1);
BOOST_TEST(r7.finish() == 8);
BOOST_TEST(r7.size(0) == 10);
}

// arithmetic operators
Expand All @@ -92,13 +99,15 @@ main()
BOOST_TEST(r8.start() == 2);
BOOST_TEST(r8.stride() == 1);
BOOST_TEST(r8.finish() == 7);
BOOST_TEST(r8.size(0) == 5);
}

{
range r9 = range(0,5) - 2;
BOOST_TEST(r9.start() == -2);
BOOST_TEST(r9.stride() == 1);
BOOST_TEST(r9.finish() == 3);
BOOST_TEST(r9.size(0) == 5);
}

return boost::report_errors();
Expand Down