- fixed fprintf codes
authorAnatoly Titov <toluk@omrb.pnpi.spb.ru>
Tue, 12 Dec 2017 10:14:30 +0000 (13:14 +0300)
committerAnatoly Titov <toluk@omrb.pnpi.spb.ru>
Tue, 12 Dec 2017 10:14:30 +0000 (13:14 +0300)
- fixed
end - > back
begin -> front

src/spirals.cpp

index 09db6e520d08ee9292d645f50f016fbb9146952a..e7c1c7efd328bbb33fb62cfea5a6a6bfe79f7da8 100644 (file)
@@ -197,17 +197,17 @@ Spirals::analyzeFrame(int frnr, const t_trxframe &fr, t_pbc *pbc,
 
     // распределение точек по виткам
     std::vector< long double > a, b, c;
-    a.resize(3);
-    b.resize(3);
-    c.resize(3);
+    a.resize(3, 0);
+    b.resize(3, 0);
+    c.resize(3, 0);
 
-    a[0] = temp[0][0] - kernel[frames].begin()->x;
-    a[1] = temp[0][1] - kernel[frames].begin()->y;
-    a[2] = temp[0][2] - kernel[frames].begin()->z;
+    a[0] = temp[0][0] - kernel[frames].front()->x;
+    a[1] = temp[0][1] - kernel[frames].front()->y;
+    a[2] = temp[0][2] - kernel[frames].front()->z;
 
-    c[0] = kernel[frames].end()->x - kernel[frames].begin()->x;
-    c[1] = kernel[frames].end()->y - kernel[frames].begin()->y;
-    c[2] = kernel[frames].end()->z - kernel[frames].begin()->z;
+    c[0] = kernel[frames].back()->x - kernel[frames].front()->x;
+    c[1] = kernel[frames].back()->y - kernel[frames].front()->y;
+    c[2] = kernel[frames].back()->z - kernel[frames].front()->z;
 
     std::vector< int > empty;
     empty.resize(0);
@@ -223,9 +223,9 @@ Spirals::analyzeFrame(int frnr, const t_trxframe &fr, t_pbc *pbc,
             b[1] = temp[i][1] - kernel[frames][i].y;
             b[2] = temp[i][2] - kernel[frames][i].z;
         } else {
-            b[0] = temp[i][0] - kernel[frames].end()->x;
-            b[1] = temp[i][1] - kernel[frames].end()->y;
-            b[2] = temp[i][2] - kernel[frames].end()->z;
+            b[0] = temp[i][0] - kernel[frames].back()->x;
+            b[1] = temp[i][1] - kernel[frames].back()->y;
+            b[2] = temp[i][2] - kernel[frames].back()->z;
         }
         long double local_sign = lr_turn(a, b ,c);
         if (sign == 0) {
@@ -280,7 +280,7 @@ Spirals::finishAnalysis(int /*nframes*/)
     file = std::fopen("kernel.txt", "w+");
     for (int i = 0; i < kernel.size(); i++) {
         for (int j = 0; j < kernel[i].size(); j++) {
-            std::fprintf(file, "%3.2Lf 3.2Lf 3.2Lf 3.2Lf\n", kernel[i][j].x, kernel[i][j].y, kernel[i][j].z, kernel[i][j].r);
+            std::fprintf(file, "%3.2Lf %3.2Lf %3.2Lf %3.2Lf\n", kernel[i][j].x, kernel[i][j].y, kernel[i][j].z, kernel[i][j].r);
         }
         std::fprintf(file, "\n");
     }