clean up

samabcde · Dec 10, 2023 · 03a4b83 · 03a4b83
1 parent 53f43de
commit 03a4b83
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/src/main/java/com/samabcde/puzzlesolver/app/validate/BlocksValidator.java b/src/main/java/com/samabcde/puzzlesolver/app/validate/BlocksValidator.java
@@ -22,7 +22,7 @@ public void validate(String[] blocks) {
             throw new IllegalArgumentException("below blocks contains character other than '0', '1', ',' %s".formatted(containsInvalids.toString()));
         }
         long weight = Arrays.stream(blocks).mapToLong(s -> s.chars().filter(c -> c == '1').count()).sum();
-        if (weight != width * height) {
+        if (weight != (long) width * height) {
             throw new IllegalArgumentException("total block weight:%s must equals puzzle size %d".formatted(weight, width * height));
         }
     }

diff --git a/src/main/java/com/samabcde/puzzlesolver/component/BlockPosition.java b/src/main/java/com/samabcde/puzzlesolver/component/BlockPosition.java
@@ -109,12 +109,6 @@ public BitSet getIsPositionIdIntersectBitSet() {
     }
 
     private boolean get(int row, int col) {
-        if (row - position.y() < 0 || row - position.y() > block.getHeight() - 1) {
-            return false;
-        }
-        if (col - position.x() < 0 || col - position.x() > block.getWidth() - 1) {
-            return false;
-        }
         return block.get(row - position.y(), col - position.x());
     }
 

diff --git a/src/main/java/com/samabcde/puzzlesolver/solve/state/PossiblePositions.java b/src/main/java/com/samabcde/puzzlesolver/solve/state/PossiblePositions.java
@@ -14,11 +14,7 @@ public class PossiblePositions {
     private final List<BlockPosition> blockPositions;
 
     public PossiblePositions(List<BlockPosition> blockPositions) {
-        if (blockPositions.isEmpty()) {
-            isCommonIntersectBitSet = new BitSet();
-        } else {
-            isCommonIntersectBitSet = new BitSet(blockPositions.get(0).getIsPositionIdIntersectBitSet().size());
-        }
+        isCommonIntersectBitSet = new BitSet(blockPositions.get(0).getIsPositionIdIntersectBitSet().size());
         this.isCommonIntersectBitSet.set(0, isCommonIntersectBitSet.size(), true);
         setCommonIntersect(isCommonIntersectBitSet, blockPositions);
         this.blockPositions = blockPositions;