getIjkl() -> extractIjkl(), getStart() -> extractStart()

olepoeschl · Jan 7, 2024 · c513a8f · c513a8f
1 parent 64c019c
commit c513a8f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/src/main/java/de/nqueensfaf/impl/CPUSolver.java b/src/main/java/de/nqueensfaf/impl/CPUSolver.java
@@ -175,8 +175,8 @@ public int getNumberOfConstellations() {
 
     public LinkedHashMap<Integer, Long> getSolutionsPerIjkl() {
 	LinkedHashMap<Integer, Long> solutionsPerIjkl = new LinkedHashMap<Integer, Long>();
-	constellations.stream().collect(Collectors.groupingBy(Constellation::getIjkl)).values().stream()
-		.forEach(cPerIjkl -> solutionsPerIjkl.put(cPerIjkl.get(0).getIjkl(),
+	constellations.stream().collect(Collectors.groupingBy(Constellation::extractIjkl)).values().stream()
+		.forEach(cPerIjkl -> solutionsPerIjkl.put(cPerIjkl.get(0).extractIjkl(),
 			cPerIjkl.stream().map(Constellation::getSolutions).reduce(0L, Long::sum)));
 	return solutionsPerIjkl;
     }

diff --git a/src/main/java/de/nqueensfaf/impl/Constellation.java b/src/main/java/de/nqueensfaf/impl/Constellation.java
@@ -70,11 +70,11 @@ public void setSolutions(long solutions) {
 	this.solutions = solutions;
     }
 
-    public int getIjkl() {
+    public int extractIjkl() {
 	return startIjkl & 0b11111111111111111111;
     }
 
-    public int getStart() {
+    public int extractStart() {
 	return startIjkl >> 20;
     }
 }
diff --git a/src/main/java/de/nqueensfaf/impl/ConstellationsGenerator.java b/src/main/java/de/nqueensfaf/impl/ConstellationsGenerator.java
@@ -80,14 +80,14 @@ public ArrayList<Constellation> generateSubConstellations(ArrayList<Constellatio
 	    // counts all subconstellations
 	    subConstellationsCounter = 0;
 
-	    placePresetQueens(bc.getLd(), bc.getRd(), bc.getCol(), getk(bc.getIjkl()), getl(bc.getIjkl()), 
-		    bc.getStart(), bc.getStart()); // from row start to row presetQueens
+	    placePresetQueens(bc.getLd(), bc.getRd(), bc.getCol(), getk(bc.extractIjkl()), getl(bc.extractIjkl()), 
+		    bc.extractStart(), bc.extractStart()); // from row start to row presetQueens
 	    currentSize = constellations.size();
 
 	    // 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.getStartIjkl() | bc.getIjkl());
+		c.setStartIjkl(c.getStartIjkl() | bc.extractIjkl());
 		c.setId(bc.getId());
 	    }
 	}

diff --git a/src/main/java/de/nqueensfaf/impl/GPUSolver.java b/src/main/java/de/nqueensfaf/impl/GPUSolver.java
@@ -631,8 +631,8 @@ public int getNumberOfConstellations() {
 
     public LinkedHashMap<Integer, Long> getSolutionsPerIjkl() {
 	LinkedHashMap<Integer, Long> solutionsPerIjkl = new LinkedHashMap<Integer, Long>();
-	constellations.stream().collect(Collectors.groupingBy(Constellation::getIjkl)).values().stream()
-		.forEach(cPerIjkl -> solutionsPerIjkl.put(cPerIjkl.get(0).getIjkl(),
+	constellations.stream().collect(Collectors.groupingBy(Constellation::extractIjkl)).values().stream()
+		.forEach(cPerIjkl -> solutionsPerIjkl.put(cPerIjkl.get(0).extractIjkl(),
 			cPerIjkl.stream().map(Constellation::getSolutions).reduce(0L, Long::sum)));
 	return solutionsPerIjkl;
     }