From b48df1a0274099cd741c6b652136381f70f2c745 Mon Sep 17 00:00:00 2001 From: Anatoly Date: Wed, 21 Oct 2020 16:46:07 +0300 Subject: [PATCH] - debug --- src/colorvec.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/colorvec.cpp b/src/colorvec.cpp index fdee1f8..71d1dab 100644 --- a/src/colorvec.cpp +++ b/src/colorvec.cpp @@ -223,11 +223,9 @@ inline void betaListsRVecsEvaluation(const std::vector< gmx::RVec > &frame, cons bool isNearPeptide(const std::vector< gmx::RVec > &inputFrame, const std::vector< size_t > &inputIndex, const std::vector< std::pair< std::string, size_t > > &inputColor, const double cutOff) { for (size_t i {0}; i < inputColor.size(); ++i) { - while (pairSearch.findNextPair(&pair)) { - for (size_t j {0}; j < inputIndex.size(); ++j) { - if ((inputFrame[inputIndex[j]] - inputFrame[inputColor[i].second]).norm() <= cutOff) { - return true; - } + for (size_t j {0}; j < inputIndex.size(); ++j) { + if ((inputFrame[inputIndex[j]] - inputFrame[inputColor[i].second]).norm() <= cutOff) { + return true; } } } @@ -467,7 +465,7 @@ colorVec::analyzeFrame(int frnr, const t_trxframe &fr, t_pbc *pbc, gmx::Trajecto colorsToPeptide.resize(colorsNames.size(), false); std::cout << "\t\tWhich colors are \"near\" the pepride mass." << std::endl; for (size_t i = 0; i < colorsNames.size(); ++i) { - colorsToPeptide[i] = isNearPeptide(fr, pbc, trajectoryFrame, /*nb_, */index, colorsNames[i]); + colorsToPeptide[i] = isNearPeptide(trajectoryFrame, index, colorsNames[i], effRad); } // расчёт угла и среднего угла с ближайшими бета листами std::vector< std::vector< bool > > colorsToBeta; -- 2.22.0