Bugfix in ConstellationsGenerator

olepoeschl · Jan 7, 2024 · c7f2b18 · c7f2b18
1 parent b1c4ab0
commit c7f2b18
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/main/java/de/nqueensfaf/Solver.java b/src/main/java/de/nqueensfaf/Solver.java
@@ -121,9 +121,8 @@ private Thread backgroundThread(boolean updateConsumer, boolean autoSaver) {
 	    float tmpProgress = progress;
 
 	    while (isRunning() && getProgress() < 1f) {
-		if(updateConsumer) {
+		if(updateConsumer)
 		    onUpdateConsumer.accept(this, getProgress(), getSolutions(), getDuration());
-		}
 
 		if(autoSaver) {
 		    progress = getProgress() * 100;
@@ -147,6 +146,9 @@ else if (progress >= tmpProgress + config().autoSavePercentageStep) {
 		    // ignore
 		}
 	    }
+
+	    if(updateConsumer)
+		onUpdateConsumer.accept(this, getProgress(), getSolutions(), getDuration());
 
 	    if(autoSaver) {
 		progress = getProgress() * 100;

diff --git a/src/main/java/de/nqueensfaf/impl/ConstellationsGenerator.java b/src/main/java/de/nqueensfaf/impl/ConstellationsGenerator.java
@@ -60,7 +60,7 @@ public ArrayList<Constellation> generate(Consumer<Constellation> constellationCo
 	    // jkl and sym and start are the same for all subconstellations
 	    for (int a = 0; a < subConstellationsCounter; a++) {
 		var c = constellations.get(currentSize - a - 1);
-		c.setStartIjkl(c.getStart() | ijkl);
+		c.setStartIjkl(c.getStartIjkl() | ijkl);
 		c.setId(currentSize - a - 1);
 
 		if(constellationConsumer != null)
@@ -87,7 +87,7 @@ public ArrayList<Constellation> generateSubConstellations(ArrayList<Constellatio
 	    // jkl and sym and start are the same for all subconstellations
 	    for (int a = 0; a < subConstellationsCounter; a++) {
 		var c = constellations.get(currentSize - a - 1);
-		c.setStartIjkl(c.getStart() | bc.getIjkl());
+		c.setStartIjkl(c.getStartIjkl() | bc.getIjkl());
 		c.setId(bc.getId());
 	    }
 	}