Merge pull request #819 from jgrewe/index_of

Adaptations for RangeDimension indexOf methods

LGTM

Author: achilleas-k

include/nix/Dimensions.hpp

@@ -26,8 +26,11 @@ class BaseTestDataAccess : public CPPUNIT_NS::TestFixture {
 
 public:
     void testPositionToIndexSetDimension();
+    void testPositionToIndexSetDimensionOld();
     void testPositionToIndexSampledDimension();
+    void testPositionToIndexSampledDimensionOld();
     void testPositionToIndexRangeDimension();
+    void testPositionToIndexRangeDimensionOld();
     void testOffsetAndCount();
     void testPositionInData();
     void testRetrieveData();

include/nix/util/dataAccess.hpp

@@ -33,19 +33,23 @@ class BaseTestDimension : public CPPUNIT_NS::TestFixture {
     void testSampledDimUnit();
     void testSampledDimSamplingInterval();
     void testSampledDimOperators();
+    void testSampledDimIndexOfOld();
     void testSampledDimIndexOf();
     void testSampledDimPositionAt();
     void testSampledDimAxis();
 
     void testSetDimLabels();
+    void testSetDimIndexOf();
 
     void testRangeDimLabel();
     void testRangeTicks();
     void testRangeDimUnit();
+    void testRangeDimIndexOfOld();
     void testRangeDimIndexOf();
     void testRangeDimTickAt();
     void testRangeDimAxis();
-
+    void testRangeDimPositionInRange();
+    
     void testAsDimensionMethods();
 };
 

src/Dimensions.cpp

@@ -17,8 +17,11 @@ class TestDataAccessHDF5 : public BaseTestDataAccess {
 
     CPPUNIT_TEST_SUITE(TestDataAccessHDF5);
     CPPUNIT_TEST(testPositionToIndexSampledDimension);
+    CPPUNIT_TEST(testPositionToIndexSampledDimensionOld);
     CPPUNIT_TEST(testPositionToIndexSetDimension);
+    CPPUNIT_TEST(testPositionToIndexSetDimensionOld);
     CPPUNIT_TEST(testPositionToIndexRangeDimension);
+    CPPUNIT_TEST(testPositionToIndexRangeDimensionOld);
     CPPUNIT_TEST(testOffsetAndCount);
     CPPUNIT_TEST(testPositionInData);
     CPPUNIT_TEST(testRetrieveData);

src/util/dataAccess.cpp

@@ -26,13 +26,17 @@ class TestDimensionHDF5 : public BaseTestDimension {
     CPPUNIT_TEST(testSampledDimSamplingInterval);
     CPPUNIT_TEST(testSampledDimOperators);
     CPPUNIT_TEST(testSampledDimIndexOf);
+    CPPUNIT_TEST(testSampledDimIndexOfOld);
     CPPUNIT_TEST(testSampledDimPositionAt);
     CPPUNIT_TEST(testSampledDimAxis);
     CPPUNIT_TEST(testSetDimLabels);
+    CPPUNIT_TEST(testSetDimIndexOf);
     CPPUNIT_TEST(testRangeDimLabel);
     CPPUNIT_TEST(testRangeDimUnit);
     CPPUNIT_TEST(testRangeTicks);
+    CPPUNIT_TEST(testRangeDimIndexOfOld);
     CPPUNIT_TEST(testRangeDimIndexOf);
+    CPPUNIT_TEST(testRangeDimPositionInRange);
     CPPUNIT_TEST(testRangeDimTickAt);
     CPPUNIT_TEST(testRangeDimAxis);
     CPPUNIT_TEST(testAsDimensionMethods);