changed the sequence of functions
authorAnatoly Titov <toluk@omrb.pnpi.spb.ru>
Tue, 15 Jan 2019 11:44:29 +0000 (14:44 +0300)
committerAnatoly Titov <toluk@omrb.pnpi.spb.ru>
Tue, 15 Jan 2019 11:44:29 +0000 (14:44 +0300)
to write corrs right after their evaluation

src/spacetimecorr.cpp

index b42f0f4f0b0af3509f8db91c5fb0c471414c628c..f09af7d93b09729543c21aa5ca79962a2b29aea2 100644 (file)
@@ -500,6 +500,11 @@ SpaceTimeCorr::finishAnalysis(int nframes)
 
     correlation_evaluation(trajectory, basic_frame, crltns, m, k);
 
+    make_correlation_matrix_file(crltns, (OutPutName + "_matrix.txt").c_str(), 0);
+    std::cout << "corelation matrix printed\n";
+    make_correlation_pairs_file(crltns, (OutPutName + "_pairs.txt").c_str(), 0);
+    std::cout << "corelation pairs printed\n";
+
     std::cout << "Correlation's evaluation - end\n" << "graph evaluation: start\n";
 
     graph_calculation(graph, sub_graph, sub_graph_rbr, trajectory, basic_frame, crltns, crl_border, eff_rad, k);
@@ -510,10 +515,6 @@ SpaceTimeCorr::finishAnalysis(int nframes)
 
     std::cout << "routs evaluation: end\n";
 
-    make_correlation_matrix_file(crltns, (OutPutName + "_matrix.txt").c_str(), 0);
-    std::cout << "corelation matrix printed\n";
-    make_correlation_pairs_file(crltns, (OutPutName + "_pairs.txt").c_str(), 0);
-    std::cout << "corelation pairs printed\n";
     make_rout_file(crl_border, index, rout_new, (OutPutName + "_routs.txt").c_str());
     std::cout << "corelation routs printed\n";
     make_best_corrs_graphics(crltns, rout_new, index, (OutPutName + "_routs_graphics.txt").c_str());