- fixed a numeric issue where staring frame was not printed correct (0>1)

and (100/... -> 99/199): fixed to be proper 0/100/200/... and so on with
all variants
- first iteration of tests completed

diff --git a/src/domaintests.cpp b/src/domaintests.cpp
index ab9a223bc5160b82e82835cfc70d8a3d0e16166f..da08ce01d1a321822605299841a95b637190e1c6 100644 (file)
--- a/src/domaintests.cpp
+++ b/src/domaintests.cpp
@@ -318,12 +318,12 @@ TEST( domainTests, domainTest_update)
     unsigned int testSliceNum = testIndex.size() - testDomainMinimumSize + 1;
     double testEpsilon = 1.5;
     double testDelta = 0.98;
-    std::string testOutPutFileName = "testString";
+    std::string testOutPutFileName1 = "testString1.ndx", testOutPutFileName2 = "testString2.ndx", testOutPutFileName3 = "testString3.ndx";
 
     domainType testDomain1, testDomain2, testDomain3;
-    testDomain1.setDefaults(testIndex, testRef, testWindowSize, testDomainMinimumSize, testDomainSearchAlgorythm, testTimeStepBetweenWindows, testSliceNum, testEpsilon, testDelta, testOutPutFileName);
-    testDomain2.setDefaults(testIndex, testRef, testWindowSize, testDomainMinimumSize, testDomainSearchAlgorythm, testTimeStepBetweenWindows, testSliceNum, testEpsilon, testDelta, testOutPutFileName);
-    testDomain3.setDefaults(testIndex, testRef, testWindowSize, testDomainMinimumSize, testDomainSearchAlgorythm, testTimeStepBetweenWindows, testSliceNum, testEpsilon, testDelta, testOutPutFileName);
+    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);
 
     std::vector< std::vector< RVec > > testTemp1, testTemp2, testTemp3;
 
@@ -338,10 +338,6 @@ TEST( domainTests, domainTest_update)
         testDomain2.update(testTemp2, i);
         testDomain3.update(testTemp3, i);
     }
-
-
-    // шаблон - глобальное применение
-    // два кирпича / крутить / вибрировать / оба хаотично
 }
 
 //

diff --git a/src/domaintype.cpp b/src/domaintype.cpp
index 8d5ea297c96321913d116d0ce721262bf87b34e9..e663040de0c0836773e2d551e986f7c3556597cc 100644 (file)
--- a/src/domaintype.cpp
+++ b/src/domaintype.cpp
@@ -186,8 +186,8 @@ void domainType::print(int currentFrame) {
     for (unsigned int i = 0; i < domains.size(); i++) {
         // domain - стартовая позиция в фреймах - номер домена - минимальный размер домена -
         // константа тепловых колебаний (отклонения) - константа входимости (отклонения)
-        std::fprintf(ndxFile, "[domain-stPos-%06d-num-%03d-dms-%03d-epsi-%04.3f-delta-%04.3f]\n", currentFrame - window, i + 1, dms, eps, dlt);
-        std::fprintf(slFile, "group %cdomain-stPos-%06d-num-%03d-dms-%03d-epsi-%04.3f-delta-%04.3f%c;\n", '"', currentFrame - window, i + 1, dms, eps, dlt, '"');
+        std::fprintf(ndxFile, "[domain-stPos-%06d-num-%03d-dms-%03d-epsi-%04.3f-delta-%04.3f]\n", currentFrame - window + 1, i + 1, dms, eps, dlt);
+        std::fprintf(slFile, "group %cdomain-stPos-%06d-num-%03d-dms-%03d-epsi-%04.3f-delta-%04.3f%c;\n", '"', currentFrame - window + 1, i + 1, dms, eps, dlt, '"');
         writeCount = 0;
         for (unsigned int j = 0; j < domains[i].size(); j++) {
             writeCount++;