Commit ed6fce0d authored by VIGNET Pierre's avatar VIGNET Pierre
Browse files

[lib] MCLQuery: fix typos; remove todo

parent 0dd39a41
...@@ -145,7 +145,7 @@ class MCLSimpleQuery(object): ...@@ -145,7 +145,7 @@ class MCLSimpleQuery(object):
# (remove the leading "%" and split the string on spaces) # (remove the leading "%" and split the string on spaces)
# - join events names with a logical operator " and " # - join events names with a logical operator " and "
var_prop = [" and ".join(raw_step[1:].split()) for raw_step in f_sol.ic_sequence] 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: if not var_prop:
var_prop = None var_prop = None
...@@ -192,7 +192,7 @@ class MCLSimpleQuery(object): ...@@ -192,7 +192,7 @@ class MCLSimpleQuery(object):
# - join events names with a logical operator " or " # - join events names with a logical operator " or "
var_prop = [" or ".join("not (" + icp + ")" for icp in raw_step[1:].split()) var_prop = [" or ".join("not (" + icp + ")" for icp in raw_step[1:].split())
for raw_step in f_sol.ic_sequence] 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: if not var_prop:
var_prop = None var_prop = None
...@@ -251,14 +251,13 @@ class MCLSimpleQuery(object): ...@@ -251,14 +251,13 @@ class MCLSimpleQuery(object):
# (remove the leading "%" and split the string on spaces) # (remove the leading "%" and split the string on spaces)
# - join events names with a logical operator " and " # - join events names with a logical operator " and "
var_prop = [" and ".join(raw_step[1:].split()) for raw_step in f_sol.ic_sequence] 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: if not var_prop:
var_prop = None var_prop = None
# inactivation of other frontier places at start (DIMACS format) # inactivation of other frontier places at start (DIMACS format)
# Search all frontiers that are not in activated_frontier # Search all frontiers that are not in activated_frontier
# and force their inactivation with a negative value. # and force their inactivation with a negative value.
## TODO: set operation...
# Get negative values of activated frontiers in FrontierSolution object # Get negative values of activated frontiers in FrontierSolution object
activated_frontier_neg_values = \ activated_frontier_neg_values = \
{-unfolder.var_dimacs_code(name) for name in f_sol.activated_frontier} {-unfolder.var_dimacs_code(name) for name in f_sol.activated_frontier}
......
Supports Markdown
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