From b2bd7b4f955a603b3a7dfbbc47cdfc1edf16906e Mon Sep 17 00:00:00 2001 From: Anatoly Titov Date: Tue, 15 Jan 2019 14:44:29 +0300 Subject: [PATCH] changed the sequence of functions to write corrs right after their evaluation --- src/spacetimecorr.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/spacetimecorr.cpp b/src/spacetimecorr.cpp index b42f0f4..f09af7d 100644 --- a/src/spacetimecorr.cpp +++ b/src/spacetimecorr.cpp @@ -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()); -- 2.22.0