refactored

zinggAI · Sep 16, 2024 · e9eb598 · e9eb598
1 parent 7a31975
commit e9eb598
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 24 deletions.
diff --git a/common/client/src/main/java/zingg/common/client/ZFrame.java b/common/client/src/main/java/zingg/common/client/ZFrame.java
@@ -185,26 +185,5 @@ public interface ZFrame<D, R, C> {
 
     public ZFrame<D, R, C> transpose(String pivotColumn);
 
-    public ZFrame<D, R, C> addAutoIncrementalRow();
-
     public void showVertical();
-
-    /***
-     * return new ZFrame with new Column added as PIVOT used for transposing the matrix
-     * @param records
-     * @return header included zFrame
-     */
-    default ZFrame<D, R, C> getHeaderIncludedDataFrame(ZFrame<D, R, C> records) {
-        ZFrame<D, R, C> orderedRowAdded = records.addAutoIncrementalRow();
-
-        ZFrame<D, R, C> firstRecord = orderedRowAdded.limit(1);
-        ZFrame<D, R, C> secondRecord = orderedRowAdded.except(firstRecord).limit(1);
-        ZFrame<D, R, C> thirdRecord = orderedRowAdded.except(firstRecord.union(secondRecord));
-
-        //return new ZFrame with Field column added to be used as pivot
-        return firstRecord.withColumn(PIVOT_COLUMN, VALUE_1).
-                union(secondRecord.withColumn(PIVOT_COLUMN, VALUE_2)).
-                union(thirdRecord.withColumn(PIVOT_COLUMN, ORDER));
-    }
-
 }
diff --git a/spark/client/src/main/java/zingg/spark/client/SparkFrame.java b/spark/client/src/main/java/zingg/spark/client/SparkFrame.java
@@ -489,8 +489,7 @@ public ZFrame<Dataset<Row>, Row, Column> transpose(String pivotColumn) {
      * @return ZFrame
      */
 
-    @Override
-    public ZFrame<Dataset<Row>, Row, Column> addAutoIncrementalRow() {
+    private ZFrame<Dataset<Row>, Row, Column> addAutoIncrementalRow() {
         String[] columns = df.columns();
         Dataset<Row> temporaryDF = df.limit(1);
         List<String> monotonicIncreasing = new ArrayList<>();
@@ -508,9 +507,26 @@ public ZFrame<Dataset<Row>, Row, Column> addAutoIncrementalRow() {
     public void showVertical() {
         ZFrame<Dataset<Row>, Row, Column> headerIncludedFrame = getHeaderIncludedDataFrame(new SparkFrame(df));
         ZFrame<Dataset<Row>, Row, Column> vertical = headerIncludedFrame.transpose(PIVOT_COLUMN);
-        vertical.sortAscending(ORDER).drop(ORDER).show();
+        vertical.sortAscending(ORDER).drop(ORDER).show(1000);
     }
 
+    /***
+     * return new ZFrame with new Column added as PIVOT used for transposing the matrix
+     * @param records
+     * @return header included zFrame
+     */
+    private ZFrame<Dataset<Row>, Row, Column> getHeaderIncludedDataFrame(ZFrame<Dataset<Row>, Row, Column> records) {
+        ZFrame<Dataset<Row>, Row, Column> orderedRowAdded = addAutoIncrementalRow();
+
+        ZFrame<Dataset<Row>, Row, Column> firstRecord = orderedRowAdded.limit(1);
+        ZFrame<Dataset<Row>, Row, Column> secondRecord = orderedRowAdded.except(firstRecord).limit(1);
+        ZFrame<Dataset<Row>, Row, Column> thirdRecord = orderedRowAdded.except(firstRecord.union(secondRecord));
+
+        //return new ZFrame with Field column added to be used as pivot
+        return firstRecord.withColumn(PIVOT_COLUMN, VALUE_1).
+                union(secondRecord.withColumn(PIVOT_COLUMN, VALUE_2)).
+                union(thirdRecord.withColumn(PIVOT_COLUMN, ORDER));
+    }
 
 }