Merge pull request #146 from opensource9ja/fix/median-bug

Fix median bug

Author: risenW

danfojs-browser/lib/bundle.js

@@ -15,7 +15,7 @@
 
 
 import * as tf from "@tensorflow/tfjs";
-import { variance, std } from 'mathjs';
+import { variance, std, median, mode } from 'mathjs';
 import { Utils } from "./utils";
 import { Str } from "./strings";
 import NDframe from "./generic";
@@ -253,9 +253,9 @@ export class Series extends NDframe {
     */
   median() {
     utils._throw_str_dtype_error(this, 'median');
-    let values = this.values;
-    let median = utils.__median(values, true);
-    return median;
+    let values = utils._remove_nans(this.values);
+    let median_val = median(values);
+    return median_val;
   }
 
 
@@ -264,10 +264,10 @@ export class Series extends NDframe {
     * @returns {Number}
     */
   mode() {
-    utils._throw_str_dtype_error(this, 'mode');
-    let values = this.values;
-    let mode = utils.__mode(values);
-    return mode;
+    utils._throw_str_dtype_error(this, 'median');
+    let values = utils._remove_nans(this.values);
+    let modal_val = mode(values);
+    return modal_val;
   }
 
 

danfojs-browser/lib/bundle.js.map

@@ -337,10 +337,10 @@ describe("Series", function () {
     it("Computes the multi-modal values of a Series", function () {
       let data1 = [ 30, 40, 3, 5, 5, 5, 5, 5, 3, 3, 3, 21, 3 ];
       let sf = new dfd.Series(data1);
-      assert.deepEqual(sf.mode(), [ 3, 5 ]);
+      assert.deepEqual(sf.mode(), [ 5, 3 ]);
     });
     it("Computes the modal value of a Series", function () {
-      let data1 = [ 30.1, 3.1, 40.2, 3.1, 5.1 ];
+      let data1 = [ 30.1, 3.1, 40.2, 3.1, 5.1, NaN ];
       let sf = new dfd.Series(data1);
       assert.deepEqual(sf.mode(), [ 3.1 ]);
     });

danfojs-browser/src/core/series.js

@@ -208,21 +208,19 @@ class Series extends _generic.default {
   median() {
     utils._throw_str_dtype_error(this, 'median');
 
-    let values = this.values;
-
-    let median = utils.__median(values, true);
+    let values = utils._remove_nans(this.values);
 
-    return median;
+    let median_val = (0, _mathjs.median)(values);
+    return median_val;
   }
 
   mode() {
-    utils._throw_str_dtype_error(this, 'mode');
-
-    let values = this.values;
+    utils._throw_str_dtype_error(this, 'median');
 
-    let mode = utils.__mode(values);
+    let values = utils._remove_nans(this.values);
 
-    return mode;
+    let modal_val = (0, _mathjs.mode)(values);
+    return modal_val;
   }
 
   min() {

danfojs-browser/tests/core/series.js

@@ -15,7 +15,7 @@
 
 
 import * as tf from '@tensorflow/tfjs-node';
-import { variance, std } from 'mathjs';
+import { variance, std, median, mode } from 'mathjs';
 import { Utils } from "./utils";
 import { Str } from "./strings";
 import NDframe from "./generic";
@@ -252,9 +252,9 @@ export class Series extends NDframe {
     */
   median() {
     utils._throw_str_dtype_error(this, 'median');
-    let values = this.values;
-    let median = utils.__median(values, true);
-    return median;
+    let values = utils._remove_nans(this.values);
+    let median_val = median(values);
+    return median_val;
   }
 
 
@@ -263,10 +263,10 @@ export class Series extends NDframe {
     * @returns {Number}
     */
   mode() {
-    utils._throw_str_dtype_error(this, 'mode');
-    let values = this.values;
-    let mode = utils.__mode(values);
-    return mode;
+    utils._throw_str_dtype_error(this, 'median');
+    let values = utils._remove_nans(this.values);
+    let modal_val = mode(values);
+    return modal_val;
   }
 
 

danfojs-node/dist/core/series.js

@@ -310,7 +310,7 @@ describe("Series", function () {
       assert.deepEqual(sf.median(), 17.5);
     });
     it("Computes the median value of elements across float Series", function () {
-      let data1 = [ 30.1, 40.2, 3.1, 5.1 ];
+      let data1 = [ 30.1, 40.2, 3.1, 5.1, NaN ];
       let sf = new Series(data1);
       assert.deepEqual(sf.median(), 17.6);
     });
@@ -338,7 +338,7 @@ describe("Series", function () {
     it("Computes the multi-modal values of a Series", function () {
       let data1 = [ 30, 40, 3, 5, 5, 5, 5, 5, 3, 3, 3, 21, 3 ];
       let sf = new Series(data1);
-      assert.deepEqual(sf.mode(), [ 3, 5 ]);
+      assert.deepEqual(sf.mode(), [ 5, 3 ]);
     });
     it("Computes the modal value of a Series", function () {
       let data1 = [ 30.1, 3.1, 40.2, 3.1, 5.1 ];

danfojs-node/src/core/series.js

@@ -6,6 +6,7 @@
         "danfojs-browser/**"
     ], 
     "scripts": {
-        "build": "cd danfojs-node && yarn build && cd ../danfojs-browser && yarn bundle"
+        "build": "cd danfojs-node && yarn build && cd ../danfojs-browser && yarn bundle",
+        "test": "cd danfojs-node && yarn test && cd ../danfojs-browser && yarn test"
     }
 }