cleaned up handling of standard comparisons for integer column types

Author: lwhite1

src/main/java/com/github/lwhite1/tablesaw/columns/ShortColumn.java

@@ -95,7 +95,7 @@ public void set(int index, short value) {
     data.set(index, value);
   }
 
-  public RoaringBitmap isLessThan(short i) {
+  public RoaringBitmap isLessThan(int i) {
     return apply(ShortColumnUtils.isLessThan, i);
   }
 

src/main/java/com/github/lwhite1/tablesaw/filter/IntGreaterThan.java

@@ -1,5 +1,6 @@
 package com.github.lwhite1.tablesaw.filter;
 
+import com.github.lwhite1.tablesaw.api.ColumnType;
 import com.github.lwhite1.tablesaw.api.Table;
 import com.github.lwhite1.tablesaw.columns.Column;
 import com.github.lwhite1.tablesaw.columns.ColumnReference;
@@ -8,8 +9,6 @@
 import com.github.lwhite1.tablesaw.columns.ShortColumn;
 import org.roaringbitmap.RoaringBitmap;
 
-import static com.github.lwhite1.tablesaw.columns.IntColumnUtils.isGreaterThan;
-
 /**
  *
  */
@@ -23,16 +22,22 @@ public IntGreaterThan(ColumnReference reference, int value) {
   }
 
   public RoaringBitmap apply(Table relation) {
-    Column column = relation.column(columnReference.getColumnName());
-    switch (column.type()) {
+    String name = columnReference.getColumnName();
+    Column column = relation.column(name);
+    ColumnType type = column.type();
+    switch (type) {
       case INTEGER:
-        return ((IntColumn) column).isGreaterThan(value);
-      case SHORT_INT:
-        return ((ShortColumn) column).isGreaterThan((short) value);
+        IntColumn intColumn = relation.intColumn(name);
+        return intColumn.isGreaterThan(value);
       case LONG_INT:
-        return ((LongColumn) column).isGreaterThan(value);
+        LongColumn longColumn = relation.longColumn(name);
+        return longColumn.isGreaterThan(value);
+      case SHORT_INT:
+        ShortColumn shortColumn = relation.shortColumn(name);
+        return shortColumn.isGreaterThan(value);
+      default:
+        throw new UnsupportedOperationException("Columns of type " + type.name() + " do not support the operation "
+            + "greaterThan(anInt) ");
     }
-    IntColumn intColumn = (IntColumn) column;
-    return intColumn.apply(isGreaterThan, value);
   }
 }

src/main/java/com/github/lwhite1/tablesaw/filter/IntLessThan.java

@@ -1,8 +1,12 @@
 package com.github.lwhite1.tablesaw.filter;
 
+import com.github.lwhite1.tablesaw.api.ColumnType;
+import com.github.lwhite1.tablesaw.columns.Column;
 import com.github.lwhite1.tablesaw.columns.IntColumn;
 import com.github.lwhite1.tablesaw.api.Table;
 import com.github.lwhite1.tablesaw.columns.ColumnReference;
+import com.github.lwhite1.tablesaw.columns.LongColumn;
+import com.github.lwhite1.tablesaw.columns.ShortColumn;
 import org.roaringbitmap.RoaringBitmap;
 
 /**
@@ -17,7 +21,22 @@ public IntLessThan(ColumnReference reference, int value) {
   }
 
   public RoaringBitmap apply(Table relation) {
-    IntColumn intColumn = (IntColumn) relation.column(columnReference.getColumnName());
-    return intColumn.isLessThan(value);
+    String name = columnReference.getColumnName();
+    Column column = relation.column(name);
+    ColumnType type = column.type();
+    switch (type) {
+      case INTEGER:
+        IntColumn intColumn = relation.intColumn(name);
+        return intColumn.isLessThan(value);
+      case LONG_INT:
+        LongColumn longColumn = relation.longColumn(name);
+        return longColumn.isLessThan(value);
+      case SHORT_INT:
+        ShortColumn shortColumn = relation.shortColumn(name);
+        return shortColumn.isLessThan(value);
+      default:
+        throw new UnsupportedOperationException("Columns of type " + type.name() + " do not support the operation "
+            + "lessThan(anInt) ");
+    }
   }
 }

src/main/java/com/github/lwhite1/tablesaw/filter/IntLessThanOrEqualTo.java

@@ -1,8 +1,12 @@
 package com.github.lwhite1.tablesaw.filter;
 
+import com.github.lwhite1.tablesaw.api.ColumnType;
 import com.github.lwhite1.tablesaw.api.Table;
+import com.github.lwhite1.tablesaw.columns.Column;
 import com.github.lwhite1.tablesaw.columns.ColumnReference;
 import com.github.lwhite1.tablesaw.columns.IntColumn;
+import com.github.lwhite1.tablesaw.columns.LongColumn;
+import com.github.lwhite1.tablesaw.columns.ShortColumn;
 import org.roaringbitmap.RoaringBitmap;
 
 /**
@@ -17,7 +21,22 @@ public IntLessThanOrEqualTo(ColumnReference reference, int value) {
   }
 
   public RoaringBitmap apply(Table relation) {
-    IntColumn intColumn = (IntColumn) relation.column(columnReference.getColumnName());
-    return intColumn.isLessThanOrEqualTo(value);
+    String name = columnReference.getColumnName();
+    Column column = relation.column(name);
+    ColumnType type = column.type();
+    switch (type) {
+      case INTEGER:
+        IntColumn intColumn = relation.intColumn(name);
+        return intColumn.isLessThanOrEqualTo(value);
+      case LONG_INT:
+        LongColumn longColumn = relation.longColumn(name);
+        return longColumn.isLessThanOrEqualTo(value);
+      case SHORT_INT:
+        ShortColumn shortColumn = relation.shortColumn(name);
+        return shortColumn.isLessThanOrEqualTo(value);
+      default:
+        throw new UnsupportedOperationException("Columns of type " + type.name() + " do not support the operation "
+            + "lessThanOrEqualTo(anInt) ");
+    }
   }
 }