Commit 7bc2a944 authored by VIGNET Pierre's avatar VIGNET Pierre
Browse files

[lib] MCLAnalyser: fix typos

parent 1bb6e8ae
......@@ -471,15 +471,15 @@ class MCLAnalyser(object):
@param query: MCLQuery
@param max_step: int - Number of steps allowed in the unfolding;
the horizon on which the properties must be satisfied
@return <tuple <DimacsFrontierSol>>
@return: <generator <FrontierSolution>>
"""
# list of timed minimal activation conditions on frontier (dimacs code)
# i.e list<DimacsFrontierSol>
mac_list = []
forbidden_frontier_values = []
reachable = self.sq_is_satisfiable(query, max_step)
print("reachable ?", reachable)
reachable = self.sq_is_satisfiable(query, max_user_step)
# get the minimum number of steps for reachability
# set number of shifts before testing final prop
min_step = self.unfolder.get_current_step() - 1
......@@ -572,18 +572,20 @@ class MCLAnalyser(object):
def mac_search(self, query, max_step):
"""Wrapper for __mac_exhaustive_search(); return FrontierSolutions
"""Wrapper for __mac_exhaustive_search(); return a generator of
FrontierSolution objects.
..note:: __mac_exhaustive_search() returns DimacsFrontierSols
@param query: MCLQuery
@param max_step: int - Number of steps allowed in the unfolding;
the horizon on which the properties must be satisfied
@return: <tuple <FrontierSolution>>
@return: <generator <FrontierSolution>>
"""
# Get <tuple <DimacsFrontierSol>>
## TODO convert start_property in dim_start !! => eviter la recompilation des propriétés
# Get <generator <DimacsFrontierSol>>
mac_list = self.__mac_exhaustive_search(query, max_step)
# Convert to a tuple of FrontierSolution
# Convert to a generator of FrontierSolution objects
#return tuple(FrontierSolution.from_dimacs_front_sol(mac) for mac in mac_list)
for mac in mac_list:
yield FrontierSolution.from_dimacs_front_sol(mac)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment