Skip to content

Fix key map range indexing #680

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

Open
lyskov-ai wants to merge 1 commit into
base: main
Choose a base branch
from
+48 −6
Open

Fix key map range indexing #680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions source/src/utility/keys/ClassKeyMap.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public: // Creation
) :
v_( beg, end )
{
for ( Index i = 1, e = v_.size(); i != e; ++i ) {
for ( Index i = 1, e = v_.size(); i <= e; ++i ) {
add_key( v_[ i ].first );
}
}
Expand Down Expand Up @@ -206,7 +206,7 @@ public: // Assignment
{
clear();
v_.assign( beg, end );
for ( Index i = 1, e = v_.size(); i != e; ++i ) {
for ( Index i = 1, e = v_.size(); i <= e; ++i ) {
add_key( v_[ i ].first );
}
}
Expand Down
4 changes: 2 additions & 2 deletions source/src/utility/keys/SmallKeyMap.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public: // Creation
v_( beg, end ),
u_( 0 )
{
for ( Index i = 1, e = v_.size(); i != e; ++i ) {
for ( Index i = 1, e = v_.size(); i <= e; ++i ) {
add_key( v_[ i ].first );
}
}
Expand Down Expand Up @@ -208,7 +208,7 @@ public: // Assignment
{
clear();
v_.assign( beg, end );
for ( Index i = 1, e = v_.size(); i != e; ++i ) {
for ( Index i = 1, e = v_.size(); i <= e; ++i ) {
add_key( v_[ i ].first );
}
}
Expand Down
23 changes: 22 additions & 1 deletion source/test/utility/keys/ClassKeyMap.cxxtest.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
#include <cxxtest/TestSuite.h>
#include <utility/keys/ClassKeyMap.hh>

// C++ headers
#include <vector>


// --- set up the individual test cases
class KeyMapTests : public CxxTest::TestSuite {
Expand Down Expand Up @@ -89,6 +92,24 @@ class KeyMapTests : public CxxTest::TestSuite {
TS_ASSERT( m[ 9 ] == 33 );
}

};
void test_ClassKeyMap_range_operations_activate_last_key() {

typedef utility::keys::ClassKeyMap< int, int, char > Map;
typedef std::vector< Map::Value > Values;

Values values;
values.push_back( Map::Value( 4, 44 ) );
values.push_back( Map::Value( 8, 88 ) );

Map constructed( values.begin(), values.end() );
TS_ASSERT( constructed.has( 8 ) );
TS_ASSERT_EQUALS( constructed[ 8 ], 88 );

Map assigned;
assigned.assign( values.begin(), values.end() );
TS_ASSERT( assigned.has( 8 ) );
TS_ASSERT_EQUALS( assigned[ 8 ], 88 );
}

};

23 changes: 22 additions & 1 deletion source/test/utility/keys/SmallKeyMap.cxxtest.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
#include <cxxtest/TestSuite.h>
#include <utility/keys/SmallKeyMap.hh>

// C++ headers
#include <vector>


class SmallKeyMapTests : public CxxTest::TestSuite {

Expand Down Expand Up @@ -88,6 +91,24 @@ class SmallKeyMapTests : public CxxTest::TestSuite {
TS_ASSERT( m[ 9 ] == 33 );
}

};
void test_SmallKeyMap_range_operations_activate_last_key() {

typedef utility::keys::SmallKeyMap< int, int > Map;
typedef std::vector< Map::Value > Values;

Values values;
values.push_back( Map::Value( 4, 44 ) );
values.push_back( Map::Value( 8, 88 ) );

Map constructed( values.begin(), values.end() );
TS_ASSERT( constructed.has( 8 ) );
TS_ASSERT_EQUALS( constructed[ 8 ], 88 );

Map assigned;
assigned.assign( values.begin(), values.end() );
TS_ASSERT( assigned.has( 8 ) );
TS_ASSERT_EQUALS( assigned[ 8 ], 88 );
}

};