Merge branch 'danfo/typescript' of https://github.com/opensource9ja/danfojs into danfo/typescript

Author: steveoni

.github/workflows/node.js.yml

@@ -5,9 +5,9 @@ name: Node.js CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, dev, danfo/typescript ]
   pull_request:
-    branches: [ master ]
+    branches: [ master, dev ]
 
 jobs:
   test:
@@ -16,12 +16,12 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [10.x, 12.x, 14.x]
+        node-version: [12.x, 14.x]
 
     steps:
     - uses: actions/checkout@v2
     - name: Use Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
-    - run: yarn && yarn test
+    - run: yarn test

.gitignore

@@ -4,3 +4,6 @@ test/fixtures/titanicO*
 danfojs-node/test/samples/test*
 danfojs-node/test/samples/titanicO*
 danfojs-node/test/samples/sampleO*
+src/danfojs-node/test/samples/sampleOut.xlsx
+src/danfojs-node/test/samples/test.xlsx
+src/danfojs-node/test/samples/testSeries.xlsx

package.json

@@ -6,8 +6,8 @@
         "danfojs-browser/**"
     ], 
     "scripts": {
-        "install": "cd danfojs-node && yarn && cd ../danfojs-browser && yarn",
-        "build": "cd danfojs-node && yarn build:clean && cd ../danfojs-browser && yarn build:clean",
-        "test": "cd danfojs-node && yarn && yarn test:clean && cd ../danfojs-browser && yarn && yarn test:clean"
+        "install": "cd src/danfojs-base && yarn && cd ../danfojs-browser && yarn && cd ../danfojs-node && yarn",
+        "build": "cd src/danfojs-node && yarn build:clean && cd ../danfojs-browser && yarn build:clean",
+        "test": "cd src/danfojs-base && yarn && cd ../danfojs-node && yarn && yarn test:clean && cd ../danfojs-browser && yarn && yarn test:clean"
     }
 }

src/danfojs-base/aggregators/groupby.ts

@@ -1,8 +1,6 @@
-import { Console } from "console";
 import DataFrame from "../core/frame"
 import { ArrayType1D, ArrayType2D } from "../shared/types"
 import { variance, std, median, mode, mean } from 'mathjs';
-import Utils from "../shared/utils";
 import  concat from "../transformers/concat"
 import Series from "../core/series";
 
@@ -450,7 +448,7 @@ export default class Groupby {
     return this.operations("min")
   }
 
-  get_group(keys: Array<string | number>): DataFrame {
+  getGroup(keys: Array<string | number>): DataFrame {
     let dictKey = keys.join("-")
     let colDict: { [key: string ]: {} }  = {}
     colDict[dictKey] = {...this.colDict[dictKey]}

src/danfojs-base/core/frame.ts

@@ -25,7 +25,6 @@ import NDframe from "./generic";
 import { table } from "table";
 import Series from './series';
 import Groupby from '../aggregators/groupby'
-import { PlotlyLib } from "../plotting";
 
 const utils = new Utils();
 
@@ -416,7 +415,7 @@ export default class DataFrame extends NDframe implements DataFrameInterface {
         if (colLen > maxColToDisplayInConsole) {
             //truncate displayed columns to fit in the console
             let firstFourcolNames = this.columns.slice(0, 4);
-            let lastThreecolNames = this.columns.slice(colLen - 4);
+            let lastThreecolNames = this.columns.slice(colLen - 3);
             //join columns with truncate ellipse in the middle
             header = ["", ...firstFourcolNames, "...", ...lastThreecolNames];
 
@@ -433,7 +432,7 @@ export default class DataFrame extends NDframe implements DataFrameInterface {
 
                 let dfSubset2 = this.iloc({
                     rows: [`0:${maxRow}`],
-                    columns: [`${colLen - 4}:`]
+                    columns: [`${colLen - 3}:`]
                 });
 
                 subIdx = this.index.slice(0, maxRow);
@@ -442,7 +441,7 @@ export default class DataFrame extends NDframe implements DataFrameInterface {
 
             } else {
                 let dfSubset1 = this.iloc({ columns: ["0:4"] });
-                let dfSubset2 = this.iloc({ columns: [`${colLen - 4}:`] });
+                let dfSubset2 = this.iloc({ columns: [`${colLen - 3}:`] });
 
                 subIdx = this.index.slice(0, maxRow);
                 firstHalfValues = dfSubset1.values as ArrayType2D
@@ -2447,17 +2446,4 @@ export default class DataFrame extends NDframe implements DataFrameInterface {
         ).group()
 
     }
-
-    /**
-     * Make plots of Series or DataFrame.
-     * Uses the Plotly as backend, so supports Plotly's configuration parameters
-     * @param divId Name of the div to show the plot
-     * @returns Plotly class that expoese different plot type
-    */
-    plot(divId: string) {
-        //TODO: Add support for check plot library to use
-        // So we can support other plot library like d3, vega, etc
-        const plt = new PlotlyLib(this, divId);
-        return plt;
-    }
 }

src/danfojs-base/core/series.ts

@@ -26,7 +26,6 @@ import Dt from './datetime';
 import dummyEncode from "../transformers/encoders/dummy.encoder";
 import DataFrame from "./frame";
 import tensorflow from '../shared/tensorflowlib'
-import { PlotlyLib } from "../plotting";
 
 const utils = new Utils();
 
@@ -1359,18 +1358,4 @@ export default class Series extends NDframe implements SeriesInterface {
     }): DataFrame {
         return dummyEncode(this, options)
     }
-
-
-    /**
-     * Make plots of Series or DataFrame.
-     * Uses the PlotlyLib as backend, so supports PlotlyLib's configuration parameters
-     * @param divId Name of the div to show the plot
-     * @returns PlotlyLib class that expoese different plot type
-    */
-    plot(divId: string) {
-        //TODO: Add support for check plot library to use
-        // So we can support other plot library like d3, vega, etc
-        const plt = new PlotlyLib(this, divId);
-        return plt;
-    }
 }

src/danfojs-base/index.ts

@@ -28,6 +28,8 @@ import concat from "./transformers/concat"
 import merge from "./transformers/merge"
 import date_range from "./core/daterange"
 
+const __version = "1.0.0"
+
 export {
     NDframe,
     Config,
@@ -45,4 +47,5 @@ export {
     concat,
     merge,
     date_range,
+    __version,
 }

src/danfojs-base/package.json

@@ -1,6 +1,6 @@
 {
   "name": "danfojs-base",
-  "version": "0.3.3",
+  "version": "1.0.0",
   "description": "Base package used in danfojs-node and danfojs-browser",
   "main": "index.ts",
   "scripts": {
@@ -9,11 +9,9 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@types/plotly.js-dist-min": "^2.3.0",
     "dotenv": "^10.0.0"
   },
   "dependencies": {
-    "plotly.js-dist-min": "^2.8.0",
     "@tensorflow/tfjs": "3.6.0",
     "@tensorflow/tfjs-node": "3.6.1",
     "mathjs": "^10.0.0",

src/danfojs-base/shared/config.ts

@@ -35,7 +35,7 @@ export default class Configs {
         } = {
             tableDisplayConfig: {},
             tableMaxRow: 10,
-            tableMaxColInConsole: 21,
+            tableMaxColInConsole: 10,
             dtypeTestLim: 10,
             lowMemoryMode: false,
             ...options

src/danfojs-base/shared/tensorflowlib.ts

@@ -1,5 +1,2 @@
-
-  // This file is auto-generated by prebuild.js. Do not edit!
-  const tf = require("@tensorflow/tfjs")
-export default tf
-  
+const tf = require("@tensorflow/tfjs-node")
+export default tf