Skip to content
Snippets Groups Projects

make graphRegex simpler

Merged vincent lorrain requested to merge devfix into dev
All threads resolved!
3 files
+ 32
1
Compare changes
  • Side-by-side
  • Inline
Files
3
@@ -117,6 +117,8 @@ std::set<std::shared_ptr<MatchSolution>> GraphRegex::match(std::shared_ptr<Graph
@@ -117,6 +117,8 @@ std::set<std::shared_ptr<MatchSolution>> GraphRegex::match(std::shared_ptr<Graph
std::vector<std::shared_ptr<MatchSolution>> solution = fsm->test(combination);
std::vector<std::shared_ptr<MatchSolution>> solution = fsm->test(combination);
solutions.insert(solutions.end(), solution.begin(), solution.end());
solutions.insert(solutions.end(), solution.begin(), solution.end());
}
}
 
 
}
}
return _findLargestCompatibleSet(solutions);
return _findLargestCompatibleSet(solutions);
}
}
@@ -142,7 +144,10 @@ void GraphRegex::setNodeKey(const std::string key,std::function<bool(NodePtr)> f
@@ -142,7 +144,10 @@ void GraphRegex::setNodeKey(const std::string key,std::function<bool(NodePtr)> f
throw std::runtime_error(key + " is define");
throw std::runtime_error(key + " is define");
}
}
mAllLambda[key] = f;
mAllLambda[key] = f;
 
_majConditionalInterpreterLambda();
_majConditionalInterpreterLambda();
 
//we add the lambda as key by default
 
setNodeKey(key, key + "($)==true");
}
}
void GraphRegex::_majConditionalInterpreterLambda(){
void GraphRegex::_majConditionalInterpreterLambda(){
Loading