Merge pull request #145 from alpha-asp/fix_144

Fix: Avoid duplicate work in ChoicePoint.recomputeActive
alpha-asp · Sep 2, 2018 · 86121a2 · 86121a2
2 parents b543685 + 8f94fdc
commit 86121a2
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/main/java/at/ac/tuwien/kr/alpha/solver/ChoiceManager.java b/src/main/java/at/ac/tuwien/kr/alpha/solver/ChoiceManager.java
@@ -163,14 +163,12 @@ void recomputeActive() {
 			LOGGER.trace("Recomputing activity of atom {}.", atom);
 			final boolean wasActive = isActive;
 			isActive = isNotChosen() && isActiveChoicePoint();
-			if (isActive) {
+			if (isActive && !wasActive) {
 				activeChoicePoints.add(this);
 				LOGGER.debug("Activating choice point for atom {}", this.atom);
-			} else {
-				if (wasActive) {
-					activeChoicePoints.remove(this);
-					LOGGER.debug("Deactivating choice point for atom {}", this.atom);
-				}
+			} else if (wasActive && !isActive) {
+				activeChoicePoints.remove(this);
+				LOGGER.debug("Deactivating choice point for atom {}", this.atom);
 			}
 		}