From b7e64b496442dd1c0247f429ca68effd3e644ef4 Mon Sep 17 00:00:00 2001
From: VIGNET Pierre <pierre.vignet@irisa.fr>
Date: Fri, 6 Dec 2019 19:25:33 +0100
Subject: [PATCH] [cmd][lib] Ooops; Fix reload of solutions previously
computed...
---
command_line/cadbiom_cmd/solution_search.py | 1 +
library/cadbiom/models/clause_constraints/mcl/MCLAnalyser.py | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/command_line/cadbiom_cmd/solution_search.py b/command_line/cadbiom_cmd/solution_search.py
index c2a4314..3773cfa 100644
--- a/command_line/cadbiom_cmd/solution_search.py
+++ b/command_line/cadbiom_cmd/solution_search.py
@@ -149,6 +149,7 @@ def get_dimacs_start_properties(mcla, previous_frontier_places):
)
for frontier_places in previous_frontier_places
]
+ return dimacs_start
def search_entry_point(
diff --git a/library/cadbiom/models/clause_constraints/mcl/MCLAnalyser.py b/library/cadbiom/models/clause_constraints/mcl/MCLAnalyser.py
index 443294b..67b8d58 100644
--- a/library/cadbiom/models/clause_constraints/mcl/MCLAnalyser.py
+++ b/library/cadbiom/models/clause_constraints/mcl/MCLAnalyser.py
@@ -685,7 +685,7 @@ class MCLAnalyser(object):
# mac_list = [] # Not used anymore
# Keep a list of frontier values to be banned in the next search
- forbidden_frontier_values = []
+ forbidden_frontier_values = query.dim_start
# Satisfiability test
reachable = self.sq_is_satisfiable(query, max_user_step)
--
GitLab