- changed to prefix "++"

[alexxy/gromacs-spacetimecorr.git] / src / spacetimecorrtests.cpp

diff --git a/src/spacetimecorrtests.cpp b/src/spacetimecorrtests.cpp
index ab4c95d0e2f47c5c9e19bf85a1cd9229d14ea2ab..f6a6b34da64c1f10119fb7061b52abea19f44e36 100644 (file)
--- a/src/spacetimecorrtests.cpp
+++ b/src/spacetimecorrtests.cpp
@@ -16,7 +16,7 @@ void trajectoryPartitionRoutine(int ndxSz, const std::vector< std::vector < std:
     for (const auto &i : sls) {
         for (const auto &j : i) {
             for (const auto &k : j) {
-                tstFlgs[k]++;
+                ++tstFlgs[k];
             }
         }
     }
@@ -29,7 +29,7 @@ TEST( corrTests, corrTests_trajectoryPartition )
     testReference.resize(0);
     std::vector< std::vector < std::vector < size_t > > >   testSels;
     testSels.resize(0);
-    std::vector< int >                                      testIndex;
+    std::vector< size_t >                                   testIndex;
     testIndex.resize(0);
     RVec                                                    a(1, 2, 3);
     std::vector< int >                                      testFlags;
@@ -37,7 +37,7 @@ TEST( corrTests, corrTests_trajectoryPartition )
     testSels.resize(1);
     testSels[0].resize(1);
     testSels[0][0].resize(0);
-    for (size_t i {0}; i < 100; i++) {
+    for (size_t i {0}; i < 100; ++i) {
         testReference.push_back(a);
         testSels[0][0].push_back(i);
         testIndex.push_back(i);
@@ -48,36 +48,36 @@ TEST( corrTests, corrTests_trajectoryPartition )
 
     testCorrs.trajectoryPartition();
 
-    for (size_t i {0}; i < testSels[0][0].size(); i++) {
+    for (size_t i {0}; i < testSels[0][0].size(); ++i) {
         ASSERT_EQ(testSels[0][0][i], testCorrs.selections[0][0][i]);
     }
 
     trajectoryPartitionRoutine(testIndex.size(), testCorrs.selections, testFlags);
-    for (size_t i {0}; i < testFlags.size(); i++) {
+    for (size_t i {0}; i < testFlags.size(); ++i) {
         ASSERT_EQ(testFlags[i], 1);
     }
 
     testSels[0].resize(0); testSels[0].resize(2);
-    for (size_t i {0}; i < 50; i++) {
+    for (size_t i {0}; i < 50; ++i) {
         testSels[0][0].push_back(i);
         testSels[0][1].push_back(i + 50);
     }
     testCorrs.selections = testSels;
     testCorrs.trajectoryPartition();
     trajectoryPartitionRoutine(testIndex.size(), testCorrs.selections, testFlags);
-    for (size_t i {0}; i < testFlags.size(); i++) {
+    for (size_t i {0}; i < testFlags.size(); ++i) {
         ASSERT_EQ(testFlags[i], 1);
     }
 
     testSels[0].resize(0); testSels[0].resize(2);
-    for (size_t i {0}; i < 50; i++) {
+    for (size_t i {0}; i < 50; ++i) {
         testSels[0][0].push_back(i);
         testSels[0][1].push_back(i + 50);
     }
     testCorrs.selections = testSels;
     testCorrs.trajectoryPartition();
     trajectoryPartitionRoutine(testIndex.size(), testCorrs.selections, testFlags);
-    for (size_t i {0}; i < testFlags.size(); i++) {
+    for (size_t i {0}; i < testFlags.size(); ++i) {
         ASSERT_EQ(testFlags[i], 1);
     }
 
@@ -92,7 +92,7 @@ TEST( corrTests, corrTests_setDefaults )
     testReference.resize(0);
     std::vector< std::vector < std::vector < size_t > > >   testSels;
     testSels.resize(0);
-    std::vector< int >                                      testIndex;
+    std::vector< size_t >                                   testIndex;
     testIndex.resize(0);
 
     int                                                     testTau_jump    {100};
@@ -107,7 +107,7 @@ TEST( corrTests, corrTests_setDefaults )
     testSels.resize(1);
     testSels[0].resize(1);
     testSels[0][0].resize(0);
-    for (size_t i {0}; i < 100; i++) {
+    for (size_t i {0}; i < 100; ++i) {
         testReference.push_back(a);
         testResNms.push_back(std::to_string(i));
         testSels[0][0].push_back(i);
@@ -123,7 +123,7 @@ TEST( corrTests, corrTests_setDefaults )
     ASSERT_EQ(testCorrs.effRadius, testEff_rad);
     ASSERT_EQ(testCorrs.mode, 0);
     ASSERT_EQ(testCorrs.outputName, testOutPutName);
-    for (size_t i {0}; i < 100; i++) {
+    for (size_t i {0}; i < 100; ++i) {
         ASSERT_EQ(testCorrs.reference[i][0], testReference[i][0]);
         ASSERT_EQ(testCorrs.reference[i][1], testReference[i][1]);
         ASSERT_EQ(testCorrs.reference[i][2], testReference[i][2]);
@@ -138,9 +138,9 @@ TEST( corrTests, corrTests_correlationEval )
     std::vector< std::vector< RVec > > testTraj;
     testTraj.resize(0);
     RVec testA;
-    for (size_t i0 {0}; i0 < 1000; i0++) {
+    for (size_t i0 {0}; i0 < 1000; ++i0) {
         testTraj.resize(testTraj.size() + 1);
-        for (size_t i1 {0}; i1 < 10; i1++) {
+        for (size_t i1 {0}; i1 < 10; ++i1) {
             testA[0] = std::sin(i0 * 2 * M_PI / 1000);
             testA[1] = std::sin(i0 * 2 * M_PI / 1000);
             testA[2] = std::sin(i0 * 2 * M_PI / 1000);
@@ -156,22 +156,22 @@ TEST( corrTests, corrTests_graphCalculations )
 {
     std::vector< std::vector< std::vector< double > > > testMatrixes;
     testMatrixes.resize(0);
-    std::vector< int >                                  testIndex;
+    std::vector< size_t >                               testIndex;
     testIndex.resize(0);
     std::vector< RVec >                                 testRef;
     testRef.resize(0);
     correlationType                                     testCorrs;
     RVec                                                testA(1, 1, 1);
-    for (size_t i {0}; i < 10; i++) {
+    for (size_t i {0}; i < 10; ++i) {
         testIndex.push_back(i);
         testRef.push_back(testA * static_cast< float >(i));
     }
     testMatrixes.resize(6);
-    for (size_t i0 {0}; i0 < 6; i0++) {
+    for (size_t i0 {0}; i0 < 6; ++i0) {
         testMatrixes[i0].resize(10);
-        for (size_t i1 {0}; i1 < 10; i1++) {
+        for (size_t i1 {0}; i1 < 10; ++i1) {
             testMatrixes[i0][i1].resize(10, 0);
-            for (size_t i2 {0}; i2 < 10; i2++) {
+            for (size_t i2 {0}; i2 < 10; ++i2) {
                 if (i2 == i1 + 1) {
                     testMatrixes[i0][i1][i2] = 1;
                     //std::cout << testMatrixes[i0][i1][i2] << " ";
@@ -186,8 +186,8 @@ TEST( corrTests, corrTests_graphCalculations )
     testCorrs.effRadius = 9000;
 
     testCorrs.graphCalculations(1, 5);
-    for (size_t i0 {0}; i0 < testCorrs.graph.size(); i0++) {
-        for (size_t i1 {0}; i1 < testCorrs.graph[i0].size(); i1++) {
+    for (size_t i0 {0}; i0 < testCorrs.graph.size(); ++i0) {
+        for (size_t i1 {0}; i1 < testCorrs.graph[i0].size(); ++i1) {
             if (i1 == i0 + 1) {
                 ASSERT_EQ(testCorrs.graph[i0][i1], std::make_pair(1., 1));
             }
@@ -195,12 +195,12 @@ TEST( corrTests, corrTests_graphCalculations )
     }
     ASSERT_EQ(testCorrs.subGraphPoints.size(), 1);
     ASSERT_EQ(testCorrs.subGraphPoints.back().size(), 10);
-    for (size_t i {0}; i < testCorrs.subGraphPoints.back().size(); i++) {
+    for (size_t i {0}; i < testCorrs.subGraphPoints.back().size(); ++i) {
         ASSERT_EQ(testCorrs.subGraphPoints.back()[i], i);
     }
     ASSERT_EQ(testCorrs.subGraphRbr.size(), 1);
     ASSERT_EQ(testCorrs.subGraphRbr.back().size(), 9);
-    for (size_t i {0}; i < testCorrs.subGraphRbr.back().size(); i++) {
+    for (size_t i {0}; i < testCorrs.subGraphRbr.back().size(); ++i) {
         ASSERT_EQ(testCorrs.subGraphRbr.back()[i], std::make_pair(i, i + 1));
     }
 
@@ -212,22 +212,22 @@ TEST( corrTests, corrTests_graphBackBoneEvaluation )
 {
     std::vector< std::vector< std::vector< double > > > testMatrixes;
     testMatrixes.resize(0);
-    std::vector< int >                                  testIndex;
+    std::vector< size_t >                               testIndex;
     testIndex.resize(0);
     std::vector< RVec >                                 testRef;
     testRef.resize(0);
     correlationType                                     testCorrs;
     RVec                                                testA(1, 1, 1);
-    for (size_t i {0}; i < 10; i++) {
+    for (size_t i {0}; i < 10; ++i) {
         testIndex.push_back(i);
         testRef.push_back(testA * static_cast< float >(i));
     }
     testMatrixes.resize(6);
-    for (size_t i0 {0}; i0 < 6; i0++) {
+    for (size_t i0 {0}; i0 < 6; ++i0) {
         testMatrixes[i0].resize(10);
-        for (size_t i1 {0}; i1 < 10; i1++) {
+        for (size_t i1 {0}; i1 < 10; ++i1) {
             testMatrixes[i0][i1].resize(10, 0.6);
-            for (size_t i2 {0}; i2 < 10; i2++) {
+            for (size_t i2 {0}; i2 < 10; ++i2) {
                 if (i2 == i1 + 1) {
                     testMatrixes[i0][i1][i2] = 1;
                 }
@@ -246,7 +246,7 @@ TEST( corrTests, corrTests_graphBackBoneEvaluation )
 
     ASSERT_EQ(testCorrs.subGraphRouts.back().size(), 1);
     ASSERT_EQ(testCorrs.subGraphRouts.back().back().size(), 9);
-    for (size_t i {0}; i < testCorrs.subGraphRouts.back().back().size(); i++) {
+    for (size_t i {0}; i < testCorrs.subGraphRouts.back().back().size(); ++i) {
         ASSERT_EQ(testCorrs.subGraphRouts.back().back()[i], std::make_pair(i, i + 1));
     }