From 59c8c1d883577a36e92e0d2b3c3e5a517f9e06c4 Mon Sep 17 00:00:00 2001 From: Anatoly Date: Fri, 2 Oct 2020 15:21:17 +0300 Subject: [PATCH] - fixed a bug with a wrong constant --- src/corrtype.cpp | 14 ++------------ src/spacetimecorr.cpp | 2 +- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/corrtype.cpp b/src/corrtype.cpp index 44530ff..be95916 100644 --- a/src/corrtype.cpp +++ b/src/corrtype.cpp @@ -34,36 +34,26 @@ void correlationType::setDefaults(const std::vector< RVec > &ref, int wnd, int t } void correlationType::update(const int frameNum, const std::vector< RVec > &curFrame) { - std::cout << "\tola001"; trajectory.push_back(curFrame); size_t temp = window + tau; - std::cout << "\tola002"; if (trajectory.size() == temp + 1) { trajectory.erase(trajectory.begin()); } - std::cout << "\tola003"; if (mode == 1) { - std::cout << "\tola004"; - if ((frameNum - temp + 1) % tauStep == 0) { - std::cout << "ola005.1" << std::endl; + if ((frameNum - temp + 1) % window == 0) { correlationEval(); selections.erase(selections.begin()); - std::cout << "ola005.2" << std::endl; + std::cout << "\n\t\tcorrEval successful\n" << std::endl; } } - std::cout << "\tola006"; } void correlationType::readEval() { - std::cout << "ola005" << std::endl; if (mode == 0) { readWriteCorrelations(0); subGraphRouts.resize(subGraphRouts.size() + 1); - std::cout << "ola006" << std::endl; graphCalculations(1, static_cast< size_t >(tau)); - std::cout << "ola007" << std::endl; graphBackBoneEvaluation(); - std::cout << "ola008" << std::endl; } } diff --git a/src/spacetimecorr.cpp b/src/spacetimecorr.cpp index f465b98..124e706 100644 --- a/src/spacetimecorr.cpp +++ b/src/spacetimecorr.cpp @@ -228,7 +228,7 @@ SpaceTimeCorr::analyzeFrame(int frnr, const t_trxframe &fr, t_pbc *pbc, Trajecto trajectoryFrame[i] = fr.x[index[i]]; } corrs.update(frnr, trajectoryFrame); - //std::cout << "\n\t\t" << frnr; + std::cout << "\n\t\t" << frnr; } void -- 2.22.0