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
ed6fce0d
Commit
ed6fce0d
authored
Nov 18, 2019
by
VIGNET Pierre
Browse files
[lib] MCLQuery: fix typos; remove todo
parent
0dd39a41
Changes
1
Hide whitespace changes
Inline
Side-by-side
library/cadbiom/models/clause_constraints/mcl/MCLQuery.py
View file @
ed6fce0d
...
...
@@ -145,7 +145,7 @@ class MCLSimpleQuery(object):
# (remove the leading "%" and split the string on spaces)
# - join events names with a logical operator " and "
var_prop
=
[
" and "
.
join
(
raw_step
[
1
:].
split
())
for
raw_step
in
f_sol
.
ic_sequence
]
#
# TODO fix this (not sure of the behaviour if var_prop is [])
#
PS: var_prop and any attribute can be [], but keep this for uniformity
if
not
var_prop
:
var_prop
=
None
...
...
@@ -192,7 +192,7 @@ class MCLSimpleQuery(object):
# - join events names with a logical operator " or "
var_prop
=
[
" or "
.
join
(
"not ("
+
icp
+
")"
for
icp
in
raw_step
[
1
:].
split
())
for
raw_step
in
f_sol
.
ic_sequence
]
#
# TODO fix this (not sure of the behaviour if var_prop is [])
#
PS: var_prop and any attribute can be [], but keep this for uniformity
if
not
var_prop
:
var_prop
=
None
...
...
@@ -251,14 +251,13 @@ class MCLSimpleQuery(object):
# (remove the leading "%" and split the string on spaces)
# - join events names with a logical operator " and "
var_prop
=
[
" and "
.
join
(
raw_step
[
1
:].
split
())
for
raw_step
in
f_sol
.
ic_sequence
]
#
# TODO fix this (not sure of the behaviour if var_prop is [])
#
PS: var_prop and any attribute can be [], but keep this for uniformity
if
not
var_prop
:
var_prop
=
None
# inactivation of other frontier places at start (DIMACS format)
# Search all frontiers that are not in activated_frontier
# and force their inactivation with a negative value.
## TODO: set operation...
# Get negative values of activated frontiers in FrontierSolution object
activated_frontier_neg_values
=
\
{
-
unfolder
.
var_dimacs_code
(
name
)
for
name
in
f_sol
.
activated_frontier
}
...
...
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