fix: update selectors getSize logic

TimefoldAI · Oct 10, 2024 · 2376f9b · 2376f9b
1 parent 38016ff
commit 2376f9b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/...va/ai/timefold/solver/core/impl/heuristic/selector/entity/FromSolutionEntitySelector.java b/...va/ai/timefold/solver/core/impl/heuristic/selector/entity/FromSolutionEntitySelector.java
@@ -106,7 +106,7 @@ public boolean isNeverEnding() {
 
     @Override
     public long getSize() {
-        return cachedEntityList.size();
+        return cachedEntityList != null ? cachedEntityList.size() : 0;
     }
 
     @Override

diff --git a/...d/solver/core/impl/heuristic/selector/entity/decorator/AbstractCachingEntitySelector.java b/...d/solver/core/impl/heuristic/selector/entity/decorator/AbstractCachingEntitySelector.java
@@ -83,7 +83,7 @@ public boolean isCountable() {
 
     @Override
     public long getSize() {
-        return cachedEntityList.size();
+        return cachedEntityList != null ? cachedEntityList.size() : 0;
     }
 
     @Override

diff --git a/...efold/solver/core/impl/heuristic/selector/entity/decorator/ProbabilityEntitySelector.java b/...efold/solver/core/impl/heuristic/selector/entity/decorator/ProbabilityEntitySelector.java
@@ -91,7 +91,7 @@ public boolean isNeverEnding() {
 
     @Override
     public long getSize() {
-        return cachedEntityMap.size();
+        return cachedEntityMap !=  null ? cachedEntityMap.size() : 0;
     }
 
     @Override

diff --git a/...i/timefold/solver/core/impl/heuristic/selector/value/chained/DefaultSubChainSelector.java b/...i/timefold/solver/core/impl/heuristic/selector/value/chained/DefaultSubChainSelector.java
@@ -152,8 +152,10 @@ public boolean isNeverEnding() {
     @Override
     public long getSize() {
         long selectionSize = 0L;
-        for (SubChain anchorTrailingChain : anchorTrailingChainList) {
-            selectionSize += calculateSubChainSelectionSize(anchorTrailingChain);
+        if (anchorTrailingChainList != null) {
+            for (SubChain anchorTrailingChain : anchorTrailingChainList) {
+                selectionSize += calculateSubChainSelectionSize(anchorTrailingChain);
+            }
         }
         return selectionSize;
     }