From 7527d054ed776a02029316f79c569a931a2f6033 Mon Sep 17 00:00:00 2001
From: VIGNET Pierre <pierre.vignet@irisa.fr>
Date: Thu, 21 Nov 2019 04:50:13 +0100
Subject: [PATCH] [lib] MCLAnalyser: __mac_exhaustive_search; Remove never
reached code; see more... At the end of the process the last current_mac
should not have 0 frontiers; it seems to be a nonsense
---
.../clause_constraints/mcl/MCLAnalyser.py | 24 +++++++------------
1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/library/cadbiom/models/clause_constraints/mcl/MCLAnalyser.py b/library/cadbiom/models/clause_constraints/mcl/MCLAnalyser.py
index b82ec0a..39bfd14 100644
--- a/library/cadbiom/models/clause_constraints/mcl/MCLAnalyser.py
+++ b/library/cadbiom/models/clause_constraints/mcl/MCLAnalyser.py
@@ -731,21 +731,15 @@ class MCLAnalyser(object):
## TEST
print("__mac_exhaustive_search:: final current step ?", self.unfolder.get_current_step())
-
- if current_mac.nb_activated_frontiers == 0:
- # Condition that seems to be never reached..
- print("NOT REACHABLE")
- reachable = False
- else:
- yield current_mac
- # mac_list.append(current_mac)
-
- # Keep a list of frontier values to be banned in the next search
- # - Get all activated frontiers on the current DimacsFrontierSol
- # - Build a list of their opposite values
- forbidden_frontier_values.append(
- [-var for var in current_mac.activated_frontier_values]
- )
+ yield current_mac
+ # mac_list.append(current_mac)
+
+ # Keep a list of frontier values to be banned in the next search
+ # - Get all activated frontiers on the current DimacsFrontierSol
+ # - Build a list of their opposite values
+ forbidden_frontier_values.append(
+ [-var for var in current_mac.activated_frontier_values]
+ )
def next_mac(self, query, max_step):
"""Search a Minimal Access Condition for the given query.
--
GitLab