From 12ae9f61fd7016cc55b820138c9cfee30df03440 Mon Sep 17 00:00:00 2001 From: Anatoly Date: Wed, 29 Jul 2020 13:17:51 +0300 Subject: [PATCH] - changed from RVec[0/1/2] to RVec(x, y, z) --- src/domaintests.cpp | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/src/domaintests.cpp b/src/domaintests.cpp index da08ce0..42b2477 100644 --- 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)); -- 2.22.0