- fixed infinite pairSearch restart
authorAnatoly <Titov_AI@pnpi.nrcki.ru>
Wed, 21 Oct 2020 12:09:19 +0000 (15:09 +0300)
committerAnatoly <Titov_AI@pnpi.nrcki.ru>
Wed, 21 Oct 2020 12:09:19 +0000 (15:09 +0300)
src/colorvec.cpp

index 39b81addb80b16e64a101293bc36a14ecef00a80..a4cc07038e8e5267736a49aeb0cd18ce33f46a4d 100644 (file)
@@ -193,12 +193,13 @@ inline void betaListsRVecsEvaluation(const std::vector< gmx::RVec > &frame, cons
 bool isNearPeptide(const t_trxframe &fr, const t_pbc *pbc, const std::vector< gmx::RVec > &inputFrame,
                           gmx::AnalysisNeighborhood &nbhood, const std::vector< size_t > &inputIndex,
                           const std::vector< std::pair< std::string, size_t > > &inputColor) {
-    gmx::AnalysisNeighborhoodSearch      nbsearch = nbhood.initSearch(pbc, gmx::AnalysisNeighborhoodPositions(fr.x, fr.natoms));
-    gmx::AnalysisNeighborhoodPair        pair;
+    gmx::AnalysisNeighborhoodSearch     nbsearch = nbhood.initSearch(pbc, gmx::AnalysisNeighborhoodPositions(fr.x, fr.natoms));
+    gmx::AnalysisNeighborhoodPair       pair;
     for (const auto &i : inputColor) {
         std::cout << i.first << std::endl;
         int count {0};
-        while (nbsearch.startPairSearch(inputFrame[i.second].as_vec()).findNextPair(&pair)) {
+        gmx::AnalysisNeighborhoodPairSearch pairSearch = nbsearch.startPairSearch(inputFrame[i.second].as_vec());
+        while (pairSearch.findNextPair(&pair)) {
             std::cout << ++count << std::endl;
             for (const auto &j : inputIndex) {
                 if (pair.refIndex() == j) {