renamed isMissingValue test methods to valueIsMissing for consistency (…

…#643)
jtablesaw · Aug 27, 2019 · 39f074b · 39f074b
1 parent 88bc648
commit 39f074b
Show file tree

Hide file tree

Showing 29 changed files with 141 additions and 67 deletions.
diff --git a/core/src/main/java/tech/tablesaw/aggregate/Summarizer.java b/core/src/main/java/tech/tablesaw/aggregate/Summarizer.java
@@ -359,7 +359,7 @@ private IntColumn assignToGroupsByStep(int step) {
 
   private Table removeLastRowIfMissingGroup(IntColumn groupColumn, Table t) {
     int i = t.row(t.rowCount() - 1).getInt(groupColumn.name());
-    if (IntColumnType.isMissingValue(i)) {
+    if (IntColumnType.valueIsMissing(i)) {
       t = t.dropWhere(Selection.with(t.rowCount() - 1));
     }
     return t;

diff --git a/core/src/main/java/tech/tablesaw/analytic/AggregateFunctions.java b/core/src/main/java/tech/tablesaw/analytic/AggregateFunctions.java
@@ -124,7 +124,7 @@ public void addRightMostMissing() {}
 
         @Override
         public void addRightMost(T newValue) {
-          if (DoubleColumnType.isMissingValue(sum)) {
+          if (DoubleColumnType.valueIsMissing(sum)) {
             this.sum = 0.0;
           }
           this.sum += newValue.doubleValue();
@@ -142,7 +142,7 @@ AggregateFunction<T, Double> functionForSlidingWindows() {
         @Override
         public void removeLeftMost() {
           Double removed = queue.remove();
-          if (DoubleColumnType.isMissingValue(removed)) {
+          if (DoubleColumnType.valueIsMissing(removed)) {
             missingCount--;
           } else {
             this.sum -= removed;
@@ -182,7 +182,7 @@ AppendAggregateFunction<T, Double> functionForAppendWindows() {
 
         @Override
         public void addRightMost(T newValue) {
-          if (DoubleColumnType.isMissingValue(max)) {
+          if (DoubleColumnType.valueIsMissing(max)) {
             max = newValue.doubleValue();
             return;
           }
@@ -224,7 +224,7 @@ public Double getValue() {
           // This could be faster, but probably does not matter in practice because sliding windows
           // will be small.
           return queue.stream()
-              .filter(d -> !DoubleColumnType.isMissingValue(d))
+              .filter(d -> !DoubleColumnType.valueIsMissing(d))
               .mapToDouble(Number::doubleValue)
               .max()
               .orElse(DoubleColumnType.missingValueIndicator());
@@ -241,7 +241,7 @@ AppendAggregateFunction<T, Double> functionForAppendWindows() {
 
         @Override
         public void addRightMost(T newValue) {
-          if (DoubleColumnType.isMissingValue(min)) {
+          if (DoubleColumnType.valueIsMissing(min)) {
             min = newValue.doubleValue();
             return;
           }
@@ -283,7 +283,7 @@ public Double getValue() {
           // This could be faster, but probably does not matter in practice because sliding windows
           // will be small.
           return queue.stream()
-              .filter(d -> !DoubleColumnType.isMissingValue(d))
+              .filter(d -> !DoubleColumnType.valueIsMissing(d))
               .mapToDouble(Number::doubleValue)
               .min()
               .orElse(DoubleColumnType.missingValueIndicator());
@@ -313,7 +313,7 @@ public void addRightMostMissing() {}
 
         @Override
         public void addRightMost(T newValue) {
-          if (DoubleColumnType.isMissingValue(sum)) {
+          if (DoubleColumnType.valueIsMissing(sum)) {
             this.sum = 0.0;
           }
           this.sum += newValue.doubleValue();
@@ -332,7 +332,7 @@ AggregateFunction<T, Double> functionForSlidingWindows() {
         @Override
         public void removeLeftMost() {
           Double removed = queue.remove();
-          if (DoubleColumnType.isMissingValue(removed)) {
+          if (DoubleColumnType.valueIsMissing(removed)) {
             missingCount--;
           } else {
             this.sum -= removed;

diff --git a/core/src/main/java/tech/tablesaw/api/BooleanColumn.java b/core/src/main/java/tech/tablesaw/api/BooleanColumn.java
@@ -81,7 +81,7 @@ private BooleanColumn(String name, ByteArrayList values) {
   }
 
   public static boolean valueIsMissing(byte b) {
-    return BooleanColumnType.isMissingValue(b);
+    return BooleanColumnType.valueIsMissing(b);
   }
 
   @Override

diff --git a/core/src/main/java/tech/tablesaw/api/DateColumn.java b/core/src/main/java/tech/tablesaw/api/DateColumn.java
@@ -418,7 +418,7 @@ public Table summary() {
   }
 
   public static boolean valueIsMissing(int i) {
-    return DateColumnType.isMissingValue(i);
+    return DateColumnType.valueIsMissing(i);
   }
 
   /** Returns the count of missing values in this column */

diff --git a/core/src/main/java/tech/tablesaw/api/DateTimeColumn.java b/core/src/main/java/tech/tablesaw/api/DateTimeColumn.java
@@ -131,7 +131,7 @@ public static DateTimeColumn create(String name, LocalDateTime[] data) {
   }
 
   public static boolean valueIsMissing(long value) {
-    return DateTimeColumnType.isMissingValue(value);
+    return DateTimeColumnType.valueIsMissing(value);
   }
 
   @Override

diff --git a/core/src/main/java/tech/tablesaw/api/DoubleColumn.java b/core/src/main/java/tech/tablesaw/api/DoubleColumn.java
@@ -44,13 +44,13 @@ protected DoubleColumn(String name, DoubleArrayList data) {
   }
 
   public static boolean valueIsMissing(double value) {
-    return DoubleColumnType.isMissingValue(value);
+    return DoubleColumnType.valueIsMissing(value);
   }
 
   @Override
   public String getString(int row) {
     final double value = getDouble(row);
-    if (DoubleColumnType.isMissingValue(value)) {
+    if (DoubleColumnType.valueIsMissing(value)) {
       return "";
     }
     return String.valueOf(getPrintFormatter().format(value));
@@ -393,7 +393,7 @@ public double getDouble(int row) {
   }
 
   public boolean isMissingValue(double value) {
-    return DoubleColumnType.isMissingValue(value);
+    return DoubleColumnType.valueIsMissing(value);
   }
 
   @Override
@@ -453,7 +453,7 @@ public DoubleColumn appendCell(final String value, AbstractColumnParser<?> parse
   @Override
   public String getUnformattedString(final int row) {
     final double value = getDouble(row);
-    if (DoubleColumnType.isMissingValue(value)) {
+    if (DoubleColumnType.valueIsMissing(value)) {
       return "";
     }
     return String.valueOf(value);
@@ -603,7 +603,7 @@ public DoubleColumn sampleX(double proportion) {
   public LongColumn asLongColumn() {
     LongColumn result = LongColumn.create(name());
     for (double d : data) {
-      if (DoubleColumnType.isMissingValue(d)) {
+      if (DoubleColumnType.valueIsMissing(d)) {
         result.appendMissing();
       } else {
         result.append((long) d);
@@ -633,7 +633,7 @@ public LongColumn asLongColumn() {
   public IntColumn asIntColumn() {
     IntColumn result = IntColumn.create(name());
     for (double d : data) {
-      if (DoubleColumnType.isMissingValue(d)) {
+      if (DoubleColumnType.valueIsMissing(d)) {
         result.appendMissing();
       } else {
         result.append((int) d);
@@ -663,7 +663,7 @@ public IntColumn asIntColumn() {
   public ShortColumn asShortColumn() {
     ShortColumn result = ShortColumn.create(name());
     for (double d : data) {
-      if (DoubleColumnType.isMissingValue(d)) {
+      if (DoubleColumnType.valueIsMissing(d)) {
         result.appendMissing();
       } else {
         result.append((short) d);
@@ -693,7 +693,7 @@ public ShortColumn asShortColumn() {
   public FloatColumn asFloatColumn() {
     FloatColumn result = FloatColumn.create(name());
     for (double d : data) {
-      if (DoubleColumnType.isMissingValue(d)) {
+      if (DoubleColumnType.valueIsMissing(d)) {
         result.appendMissing();
       } else {
         result.append((float) d);

diff --git a/core/src/main/java/tech/tablesaw/api/FloatColumn.java b/core/src/main/java/tech/tablesaw/api/FloatColumn.java
@@ -38,7 +38,7 @@ private FloatColumn(String name, FloatArrayList data) {
   @Override
   public String getString(int row) {
     final float value = getFloat(row);
-    if (FloatColumnType.isMissingValue(value)) {
+    if (FloatColumnType.valueIsMissing(value)) {
       return "";
     }
     return String.valueOf(getPrintFormatter().format(value));
@@ -90,7 +90,7 @@ public Float get(int index) {
   }
 
   public static boolean valueIsMissing(float value) {
-    return FloatColumnType.isMissingValue(value);
+    return FloatColumnType.valueIsMissing(value);
   }
 
   @Override
@@ -299,7 +299,7 @@ public float getFloat(int row) {
   }
 
   public boolean isMissingValue(float value) {
-    return FloatColumnType.isMissingValue(value);
+    return FloatColumnType.valueIsMissing(value);
   }
 
   @Override
@@ -361,7 +361,7 @@ public FloatColumn appendCell(final String value, AbstractColumnParser<?> parser
   @Override
   public String getUnformattedString(final int row) {
     final float value = getFloat(row);
-    if (FloatColumnType.isMissingValue(value)) {
+    if (FloatColumnType.valueIsMissing(value)) {
       return "";
     }
     return String.valueOf(value);
@@ -473,7 +473,7 @@ public FloatColumn sampleX(double proportion) {
   public LongColumn asLongColumn() {
     LongColumn result = LongColumn.create(name());
     for (float d : data) {
-      if (FloatColumnType.isMissingValue(d)) {
+      if (FloatColumnType.valueIsMissing(d)) {
         result.appendMissing();
       } else {
         result.append((long) d);
@@ -503,7 +503,7 @@ public LongColumn asLongColumn() {
   public IntColumn asIntColumn() {
     IntColumn result = IntColumn.create(name());
     for (float d : data) {
-      if (FloatColumnType.isMissingValue(d)) {
+      if (FloatColumnType.valueIsMissing(d)) {
         result.appendMissing();
       } else {
         result.append((int) d);
@@ -533,7 +533,7 @@ public IntColumn asIntColumn() {
   public ShortColumn asShortColumn() {
     ShortColumn result = ShortColumn.create(name());
     for (float d : data) {
-      if (FloatColumnType.isMissingValue(d)) {
+      if (FloatColumnType.valueIsMissing(d)) {
         result.appendMissing();
       } else {
         result.append((short) d);
@@ -553,7 +553,7 @@ public ShortColumn asShortColumn() {
   public DoubleColumn asDoubleColumn() {
     DoubleColumn result = DoubleColumn.create(name());
     for (float d : data) {
-      if (FloatColumnType.isMissingValue(d)) {
+      if (FloatColumnType.valueIsMissing(d)) {
         result.appendMissing();
       } else {
         result.append(d);

diff --git a/core/src/main/java/tech/tablesaw/api/InstantColumn.java b/core/src/main/java/tech/tablesaw/api/InstantColumn.java
@@ -116,7 +116,7 @@ public static InstantColumn create(String name, Stream<Instant> stream) {
   }
 
   public static boolean valueIsMissing(long value) {
-    return InstantColumnType.isMissingValue(value);
+    return InstantColumnType.valueIsMissing(value);
   }
 
   @Override

diff --git a/core/src/main/java/tech/tablesaw/api/IntColumn.java b/core/src/main/java/tech/tablesaw/api/IntColumn.java
@@ -100,7 +100,7 @@ public void clear() {
   }
 
   public static boolean valueIsMissing(int value) {
-    return IntColumnType.isMissingValue(value);
+    return IntColumnType.valueIsMissing(value);
   }
 
   @Override
@@ -283,7 +283,7 @@ public byte[] asBytes(int rowNumber) {
   @Override
   public String getString(final int row) {
     final int value = getInt(row);
-    if (IntColumnType.isMissingValue(value)) {
+    if (IntColumnType.valueIsMissing(value)) {
       return "";
     }
     return String.valueOf(getPrintFormatter().format(value));
@@ -331,7 +331,7 @@ public double getDouble(int row) {
   }
 
   public boolean isMissingValue(int value) {
-    return IntColumnType.isMissingValue(value);
+    return IntColumnType.valueIsMissing(value);
   }
 
   @Override
@@ -383,7 +383,7 @@ public IntColumn appendCell(final String value, AbstractColumnParser<?> parser)
   @Override
   public String getUnformattedString(final int row) {
     final int value = getInt(row);
-    if (IntColumnType.isMissingValue(value)) {
+    if (IntColumnType.valueIsMissing(value)) {
       return "";
     }
     return String.valueOf(value);
@@ -486,7 +486,7 @@ public IntColumn sampleX(double proportion) {
   public LongColumn asLongColumn() {
     LongColumn result = LongColumn.create(name());
     for (int d : data) {
-      if (IntColumnType.isMissingValue(d)) {
+      if (IntColumnType.valueIsMissing(d)) {
         result.appendMissing();
       } else {
         result.append(d);
@@ -514,7 +514,7 @@ public LongColumn asLongColumn() {
   public FloatColumn asFloatColumn() {
     FloatColumn result = FloatColumn.create(name());
     for (int d : data) {
-      if (IntColumnType.isMissingValue(d)) {
+      if (IntColumnType.valueIsMissing(d)) {
         result.appendMissing();
       } else {
         result.append(d);
@@ -542,7 +542,7 @@ public FloatColumn asFloatColumn() {
   public DoubleColumn asDoubleColumn() {
     DoubleColumn result = DoubleColumn.create(name());
     for (int d : data) {
-      if (IntColumnType.isMissingValue(d)) {
+      if (IntColumnType.valueIsMissing(d)) {
         result.appendMissing();
       } else {
         result.append(d);
@@ -571,7 +571,7 @@ public DoubleColumn asDoubleColumn() {
   public ShortColumn asShortColumn() {
     ShortColumn result = ShortColumn.create(name());
     for (int d : data) {
-      if (IntColumnType.isMissingValue(d)) {
+      if (IntColumnType.valueIsMissing(d)) {
         result.appendMissing();
       } else {
         result.append((short) d);