Remove buggy compare. Table compareRows uses the other compare method

jtablesaw · Jan 8, 2025 · 90c3083 · 90c3083
1 parent 450e18d
commit 90c3083
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/core/src/main/java/tech/tablesaw/api/ColumnType.java b/core/src/main/java/tech/tablesaw/api/ColumnType.java
@@ -82,19 +82,11 @@ static ColumnType valueOf(String name) {
   /** TODO: Research this method to provide a good comment */
   AbstractColumnParser<?> customParser(ReadOptions options);
 
-  /**
-   * Compares the row at {@code rowNumber} in {@code column1} and {@code column2} and returns whether they are equal.
-   * @throws {@code IndexOutOfBoundsException} if {@code rowNumber} exceeds either column size
-   */
-  default boolean compare(int rowNumber, Column<?> column1, Column<?> column2) {
-    Object o1 = column2.get(rowNumber);
-    Object o2 = column1.get(rowNumber);
-    return o1 == null ? o2 == null : o1.equals(o2);
-  }
-
   /**
    * Returns true if the value at the specified index in column1 is equal to the value at the
    * specified index in column 2
+   *
+   * @throws {@code IndexOutOfBoundsException} if either index exceeds the corresponding column size
    */
   default boolean compare(int col1Row, Column<?> col1, int col2Row, Column<?> col2) {
     Object o1 = col1.get(col1Row);

diff --git a/core/src/main/java/tech/tablesaw/api/Table.java b/core/src/main/java/tech/tablesaw/api/Table.java
@@ -529,9 +529,12 @@ public void copyRowsToTable(int[] rows, Table newTable) {
   }
 
   /**
-   * Returns {@code true} if the row {@code rowNumber} in {@code table1} holds the same values than the row at
-   * {@code rowNumber} in {@code table2}. Returns {@code false} if the number of columns is different in the two tables.
-   * @throws {@code IndexOutOfBoundsException} if {@code rowNumber} exceeds either table number of rows
+   * Returns {@code true} if the row {@code rowNumber} in {@code table1} holds the same values than
+   * the row at {@code rowNumber} in {@code table2}. Returns {@code false} if the number of columns
+   * is different in the two tables.
+   *
+   * @throws {@code IndexOutOfBoundsException} if {@code rowNumber} exceeds either table number of
+   *     rows
    */
   public static boolean compareRows(int rowNumber, Table table1, Table table2) {
     final int columnCount = table1.columnCount();
@@ -540,7 +543,8 @@ public static boolean compareRows(int rowNumber, Table table1, Table table2) {
     }
     for (int columnIndex = 0; columnIndex < columnCount; columnIndex++) {
       ColumnType columnType = table1.column(columnIndex).type();
-      if (!columnType.compare(rowNumber, table2.column(columnIndex), table1.column(columnIndex))) {
+      if (!columnType.compare(
+          rowNumber, table2.column(columnIndex), rowNumber, table1.column(columnIndex))) {
         return false;
       }
     }