Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
VIGNET Pierre
cadbiom
Commits
7a169a8e
Commit
7a169a8e
authored
Dec 06, 2016
by
VIGNET Pierre
Browse files
Fix incorrect type of obj about previous frontier places
parent
78112581
Changes
1
Hide whitespace changes
Inline
Side-by-side
script_mac.py
View file @
7a169a8e
...
...
@@ -25,10 +25,12 @@ class ErrorRep(object):
def
display
(
self
,
mess
):
self
.
error
=
True
LOGGER
.
debug
(
">> Context: {}; {}"
.
format
(
self
.
context
,
mess
))
LOGGER
.
error
(
">> Context: {}; {}"
.
format
(
self
.
context
,
mess
))
exit
()
def
display_info
(
self
,
mess
):
LOGGER
.
debug
(
"-- Context: {}; {}"
.
format
(
self
.
context
,
mess
))
LOGGER
.
error
(
"-- Context: {}; {}"
.
format
(
self
.
context
,
mess
))
exit
()
def
set_context
(
self
,
cont
):
self
.
context
=
cont
...
...
@@ -113,20 +115,26 @@ def main2(chart_file, cam_file, cam_step_file, cam_complete_file, cam_strong_fil
steps
,
final_prop
,
start_prop
,
inv_prop
)
# Add theese frontier places to set of previous ones
previous_frontier_places
.
update
(
frontier_places
)
# (tuple is hashable)
previous_frontier_places
.
add
(
tuple
(
frontier_places
))
LOGGER
.
debug
(
"Prev frontier places: "
+
\
str
(
previous_frontier_places
))
# Compute the formula of the next start_property
start_prop
=
make_logical_formula
(
previous_frontier_places
,
start_prop
)
LOGGER
.
debug
(
"Next start_prop formula: "
+
str
(
start_prop
))
steps
=
min_steps
LOGGER
.
debug
(
"Next start_prop formula: {} in {} steps"
.
format
(
start_prop
,
steps
)
)
def
find_mac
(
mcla
,
cam_file
,
cam_step_file
,
cam_complete_file
,
steps
,
final_prop
,
start_prop
,
inv_prop
):
"""
list, min step
"""
# Build query
query
=
MCLSimpleQuery
(
start_prop
,
inv_prop
,
final_prop
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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