Better threshold application

stanford-futuredata · Apr 25, 2018 · 648c77e · 648c77e
1 parent bab6832
commit 648c77e
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/.../main/java/edu/stanford/futuredata/macrobase/analysis/summary/aplinear/APrioriLinear.java b/.../main/java/edu/stanford/futuredata/macrobase/analysis/summary/aplinear/APrioriLinear.java
@@ -7,6 +7,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.roaringbitmap.RoaringBitmap;
+import org.w3c.dom.Attr;
 
 import java.util.*;
 import java.util.concurrent.CountDownLatch;
@@ -195,7 +196,9 @@ public List<APLExplanationResult> explain(
                                     continue;
                                 }
                                 int[] curColumnTwoAttributes = byThreadAttributesTranspose[curThreadNum][colNumTwo];
-                                if (colCardinalities[colNumOne] * colCardinalities[colNumTwo] < 128) {
+                                if (colCardinalities[colNumOne] < AttributeEncoder.cardinalityThreshold &&
+                                        colCardinalities[colNumOne] < AttributeEncoder.cardinalityThreshold &&
+                                        colCardinalities[colNumOne] * colCardinalities[colNumTwo] < 256) {
                                     // Bitmap-Bitmap
                                     allTwoBitmap(thisThreadSetAggregates, outlierList, aggregationOps, singleNextArray,
                                             byThreadBitmap[curThreadNum], colNumOne, colNumTwo, useIntSetAsArray,
@@ -226,7 +229,10 @@ public List<APLExplanationResult> explain(
                                         continue;
                                     }
                                     int[] curColumnThreeAttributes = byThreadAttributesTranspose[curThreadNum][colNumThree % numColumns];
-                                    if (colCardinalities[colNumOne] * colCardinalities[colNumTwo] < 128) {
+                                    if (colCardinalities[colNumOne] < AttributeEncoder.cardinalityThreshold &&
+                                            colCardinalities[colNumOne] < AttributeEncoder.cardinalityThreshold &&
+                                            colCardinalities[colNumThree] < AttributeEncoder.cardinalityThreshold &&
+                                            colCardinalities[colNumOne] * colCardinalities[colNumTwo] * colCardinalities[colNumThree] < 256) {
                                         // all 3 cols are bitmaps
                                         allThreeBitmap(thisThreadSetAggregates, outlierList, aggregationOps,
                                                 singleNextArray, byThreadBitmap[curThreadNum],