Optimized size estimates

nibix · Jun 15, 2024 · 59a36c0 · 59a36c0
1 parent 563e51c
commit 59a36c0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/src/main/java/com/selectivem/check/BackingCollections.java b/src/main/java/com/selectivem/check/BackingCollections.java
@@ -111,7 +111,7 @@ static <E> IndexedUnmodifiableSet<E> of(Set<E> set) {
             } else {
                 if (size <= 800) {
                     InternalBuilder<E> internalBuilder = new HashArrayBackedSet.Builder<E>(
-                            size <= 8 ? 16 : size <= 40 ? 64 : size < 200 ? 256 : 1024);
+                            size <= 8 ? 16 : size <= 40 ? 64 : size < 200 ? 256 : 1024, size);
 
                     for (E e : set) {
                         internalBuilder = internalBuilder.with(e);
@@ -126,7 +126,7 @@ static <E> IndexedUnmodifiableSet<E> of(Set<E> set) {
 
         static <E> InternalBuilder<E> builder(int size) {
             if (size <= 800) {
-                return new HashArrayBackedSet.Builder<E>(size <= 10 ? 16 : size <= 50 ? 64 : size < 200 ? 256 : 1024);
+                return new HashArrayBackedSet.Builder<E>(size <= 10 ? 16 : size <= 50 ? 64 : size < 200 ? 256 : 1024, size);
             } else {
                 return new SetBackedSet.Builder<E>(size);
             }
@@ -662,6 +662,13 @@ public Builder(int tableSize) {
                 this.tableSize = tableSize;
             }
 
+            public Builder(int tableSize, int flatSize) {
+                this.tableSize = tableSize;
+                if (flatSize > 0) {
+                    this.flat = createEArray(flatSize);
+                }
+            }
+
             public InternalBuilder<E> with(E e) {
                 if (e == null) {
                     throw new IllegalArgumentException("Null elements are not supported");

diff --git a/src/main/java/com/selectivem/check/CheckTableImpl.java b/src/main/java/com/selectivem/check/CheckTableImpl.java
@@ -1449,7 +1449,6 @@ public String toTableString(String checkedIndicator, String uncheckedIndicator)
 
                 i = 0;
                 for (C column : columns) {
-
                     String v = isChecked(row, column) ? checkedIndicator : uncheckedIndicator;
 
                     result.append(" ");
@@ -1458,7 +1457,6 @@ public String toTableString(String checkedIndicator, String uncheckedIndicator)
                     i++;
                 }
                 result.append("\n");
-
             }
 
             return result.toString();
@@ -1474,7 +1472,8 @@ public Set<R> getCompleteRows() {
                 return rows;
             }
 
-            BackingCollections.IndexedUnmodifiableSet.InternalBuilder<R> builder = BackingCollections.IndexedUnmodifiableSet.builder(rowCount);
+            int estimatedRows = Math.min(checkedCount / columnCount + 12, rowCount - 1);
+            BackingCollections.IndexedUnmodifiableSet.InternalBuilder<R> builder = BackingCollections.IndexedUnmodifiableSet.builder(estimatedRows);
 
             for (int rowIndex = 0; rowIndex < rowCount; rowIndex++) {
                 if (isRowCompleted(rowIndex)) {
@@ -1496,7 +1495,8 @@ public Set<C> getCompleteColumns() {
                 return columns;
             }
 
-            BackingCollections.IndexedUnmodifiableSet.InternalBuilder<C> builder = BackingCollections.IndexedUnmodifiableSet.builder(columnCount);
+            int estimatedColumns = Math.min(checkedCount / rowCount + 12, columnCount - 1);
+            BackingCollections.IndexedUnmodifiableSet.InternalBuilder<C> builder = BackingCollections.IndexedUnmodifiableSet.builder(estimatedColumns);
 
             for (int columnIndex = 0; columnIndex < columnCount; columnIndex++) {
                 if (isColumnCompleted(columnIndex)) {
@@ -1518,7 +1518,8 @@ public Set<R> getIncompleteRows() {
                 return rows;
             }
 
-            BackingCollections.IndexedUnmodifiableSet.InternalBuilder<R> builder = BackingCollections.IndexedUnmodifiableSet.builder(rowCount);
+            int estimatedRows = Math.min(uncheckedCount / columnCount + 12, rowCount - 1);
+            BackingCollections.IndexedUnmodifiableSet.InternalBuilder<R> builder = BackingCollections.IndexedUnmodifiableSet.builder(estimatedRows);
 
             for (int rowIndex = 0; rowIndex < rowCount; rowIndex++) {
                 if (!isRowCompleted(rowIndex)) {
@@ -1540,7 +1541,8 @@ public Set<C> getIncompleteColumns() {
                 return columns;
             }
 
-            BackingCollections.IndexedUnmodifiableSet.InternalBuilder<C> builder = BackingCollections.IndexedUnmodifiableSet.builder(columnCount);
+            int estimatedColumns = Math.min(uncheckedCount / rowCount + 12, columnCount - 1);
+            BackingCollections.IndexedUnmodifiableSet.InternalBuilder<C> builder = BackingCollections.IndexedUnmodifiableSet.builder(estimatedColumns);
 
             for (int columnIndex = 0; columnIndex < columnCount; columnIndex++) {
                 if (!isColumnCompleted(columnIndex)) {