fix: search by template in generated struct only

ostis-apps · Nov 19, 2024 · 3e3a51c · 3e3a51c
1 parent a160515
commit 3e3a51c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 32 deletions.
diff --git a/problem-solver/cxx/searchModule/agents/FindSolvingMethodAgent.cpp b/problem-solver/cxx/searchModule/agents/FindSolvingMethodAgent.cpp
@@ -85,9 +85,16 @@ ScResult FindSolvingMethodAgent::DoProgram(ScActionInitiatedEvent const & event,
             generatedStruct << templateResult[i];
           }
           ScTemplateSearchResult searchResult;
-
-          if (m_context.SearchByTemplate(targetSituationTemplate, searchResult) &&
-              isGeneratedStructureFound(generatedStruct, searchResult))
+          bool isGeneratedConstructionFound = false;
+          m_context.SearchByTemplate(
+              targetSituationTemplate,
+              [&isGeneratedConstructionFound](ScTemplateSearchResultItem const & item) -> void {
+                isGeneratedConstructionFound = true;
+              },
+              [this, generatedStruct](ScAddr const & elementAddr) -> bool {
+                return m_context.CheckConnector(generatedStruct, elementAddr, ScType::EdgeAccessConstPosPerm);
+              });
+          if (isGeneratedConstructionFound)
           {
             suitableMethods.insert(solvingMethod);
             break;
@@ -207,34 +214,6 @@ ScAddr FindSolvingMethodAgent::getSolvingMethodWorkingResultTemplate(ScAddr cons
   throw std::runtime_error("Problem solving method has incorrect condition of use and result edge");
 }
 
-bool FindSolvingMethodAgent::isGeneratedStructureFound(
-    ScStructure const & generatedStruct,
-    ScTemplateSearchResult const & searchResult)
-{
-  bool isFound;
-  for (size_t i = 0; i < searchResult.Size(); i++)
-  {
-    isFound = true;
-    ScTemplateResultItem resultItem;
-    searchResult.Get(i, resultItem);
-    for (size_t j = 0; j < resultItem.Size(); j++)
-    {
-      ScAddr el;
-      resultItem.Get(j, el);
-      if (!m_context.CheckConnector(generatedStruct, el, ScType::EdgeAccessConstPosPerm))
-      {
-        isFound = false;
-        break;
-      }
-    }
-    if (isFound)
-    {
-      break;
-    }
-  }
-  return isFound;
-}
-
 void FindSolvingMethodAgent::formResult(ScAction & action, ScAddrSet const & suitableMethods)
 {
   ScAddr resEdge;

diff --git a/problem-solver/cxx/searchModule/agents/FindSolvingMethodAgent.hpp b/problem-solver/cxx/searchModule/agents/FindSolvingMethodAgent.hpp
@@ -17,7 +17,6 @@ class FindSolvingMethodAgent : public ScActionInitiatedAgent
   ScAddr getProblemActionNode(ScAddr const & problemStruct);
   ScAddr getProblemConcept(ScAddr const & problemStruct);
   ScAddr getSolvingMethodWorkingResultTemplate(ScAddr const & solvingMethod);
-  bool isGeneratedStructureFound(const ScStructure & generatedStruct, const ScTemplateSearchResult &);
   void formResult(ScAction & action, ScAddrSet const & suitableMethods);
   void removeGeneratedStructures(ScAddrSet const & structuresToRemove, ScAddrSet const & elementsToSave);
 };