Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
VIGNET Pierre
cadbiom
Commits
7bc2a944
Commit
7bc2a944
authored
Nov 20, 2019
by
VIGNET Pierre
Browse files
[lib] MCLAnalyser: fix typos
parent
1bb6e8ae
Changes
1
Hide whitespace changes
Inline
Side-by-side
library/cadbiom/models/clause_constraints/mcl/MCLAnalyser.py
View file @
7bc2a944
...
...
@@ -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 <Dimacs
FrontierSol>>
@return
:
<
generator <
FrontierSol
ution
>>
"""
# 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
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment