- changed from RVec[0/1/2] to RVec(x, y, z)

[alexxy/gromacs-domains.git] / src / domaintests.cpp

diff --git a/src/domaintests.cpp b/src/domaintests.cpp
index da08ce01d1a321822605299841a95b637190e1c6..42b2477ad50995cef1792513e1fe1b53ea08f856 100644 (file)
--- a/src/domaintests.cpp
+++ b/src/domaintests.cpp
@@ -44,15 +44,8 @@ TEST( fitTests, fitTest_searchF0xyzabc)
 
 TEST( fitTests, fitTest_ApplyFit)
 {
-    RVec mid1, mid2, x1, y1, z1, x2, y2, z2;
+    RVec mid1, mid2, x1(1, 0, 0), y1(0, 1, 0), z1(0, 0, 1), x2(-1, 0, 0), y2(0, -1, 0), z2(0, 0, -1);
 
-    x1[0] = 1; x1[1] = 0; x1[2] = 0;
-    y1[0] = 0; y1[1] = 1; y1[2] = 0;
-    z1[0] = 0; z1[1] = 0; z1[2] = 1;
-
-    x2[0] = -1; x2[1] = 0; x2[2] = 0;
-    y2[0] = 0; y2[1] = -1; y2[2] = 0;
-    z2[0] = 0; z2[1] = 0; z2[2] = -1;
 
     std::vector< RVec > testFrame1, testFrame2, testFrame3;
     testFrame1.resize(0);
@@ -283,10 +276,7 @@ TEST( domainTests, domainTest_update)
     testTraj1.resize(0);
     testTraj2.resize(0);
     testTraj3.resize(0);
-    RVec testA, testB, testC;
-    testA[0] = 1; testA[1] = 2; testA[2] = 3;
-    testB[0] = 1; testB[1] = 0; testB[2] = 0;
-    testC[0] = 0; testC[1] = 1; testC[2] = 0;
+    RVec testA(1, 2, 3), testB(1, 0, 0), testC(0, 1, 0);
     for (unsigned int i0 = 0; i0 < 1000; i0++) {
         testTraj1.resize(testTraj1.size() + 1);
         testTraj2.resize(testTraj2.size() + 1);
@@ -322,8 +312,8 @@ TEST( domainTests, domainTest_update)
 
     domainType testDomain1, testDomain2, testDomain3;
     testDomain1.setDefaults(testIndex, testRef, testWindowSize, testDomainMinimumSize, testDomainSearchAlgorythm, testTimeStepBetweenWindows, testSliceNum, testEpsilon, testDelta, testOutPutFileName1);
-    //testDomain2.setDefaults(testIndex, testRef, testWindowSize, testDomainMinimumSize, testDomainSearchAlgorythm, testTimeStepBetweenWindows, testSliceNum, testEpsilon, testDelta, testOutPutFileName2);
-    //testDomain3.setDefaults(testIndex, testRef, testWindowSize, testDomainMinimumSize, testDomainSearchAlgorythm, testTimeStepBetweenWindows, testSliceNum, testEpsilon, testDelta, testOutPutFileName3);
+    testDomain2.setDefaults(testIndex, testRef, testWindowSize, testDomainMinimumSize, testDomainSearchAlgorythm, testTimeStepBetweenWindows, testSliceNum, testEpsilon, testDelta, testOutPutFileName2);
+    testDomain3.setDefaults(testIndex, testRef, testWindowSize, testDomainMinimumSize, testDomainSearchAlgorythm, testTimeStepBetweenWindows, testSliceNum, testEpsilon, testDelta, testOutPutFileName3);
 
     std::vector< std::vector< RVec > > testTemp1, testTemp2, testTemp3;
 
@@ -367,9 +357,7 @@ TEST( domainTests, domainTest_getDomains)
     std::vector< RVec > testRef;
     testRef.resize(0);
 
-    RVec testA, testB;
-    testA[0] = 0; testA[1] = 0; testA[2] = 0;
-    testB[0] = 1; testB[1] = 1; testB[2] = 1;
+    RVec testA(0, 0, 0), testB(1, 1, 1);
     for (unsigned int i = 0; i < 100; i++) {
         testIndex.push_back(i);
         testRef.push_back(testA + testB * static_cast< float >(i));