Merge branch 'master' into danfojs-browser

risenW · web-flow · commit f58d17ebb72a · 2021-03-06T08:12:30.000+01:00
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/README.md b/README.md
@@ -49,7 +49,7 @@ easy and intuitive. It is heavily inspired by [Pandas](https://pandas.pydata.org
 
 
 
-To use Danfo.js via script tags, copy and paste the CDN below to your HTML file
+To use Danfo.js via script tags, copy and paste the CDN below to the body of your HTML file
 
 ```html
     <script src="https://cdn.jsdelivr.net/npm/danfojs@0.2.2/lib/bundle.min.js"></script> 
@@ -66,11 +66,11 @@ To use Danfo.js via script tags, copy and paste the CDN below to your HTML file
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <script src="https://cdn.jsdelivr.net/npm/danfojs@0.2.2/lib/bundle.min.js"></script> 
     <title>Document</title>
 </head>
 
 <body>
+    <script src="https://cdn.jsdelivr.net/npm/danfojs@0.2.2/lib/bundle.min.js"></script> 
 
     <div id="div1"></div>
     <div id="div2"></div>
@@ -175,6 +175,8 @@ Output in Node Console:
 
 ![](assets/node-rec.gif)
 
+> If you want to use Danfo in frontend frameworks like React/Vue, read this [guide](https://danfo.jsdata.org/examples/using-danfojs-in-react)
+
 #### You can play with Danfo.js on Dnotebooks playground [here](https://playnotebook.jsdata.org/demo)
 
 #### [See the Official Getting Started Guide](https://danfo.jsdata.org/getting-started)
diff --git a/danfojs/src/core/generic.js b/danfojs/src/core/generic.js
@@ -102,7 +102,7 @@ export default class NDframe {
         ) {
           this.columns = this.kwargs["columns"];
         } else {
-          throw `Column length mismatch. You provided a column of length ${this.kwargs["columns"].length} but data has lenght of ${this.row_data_tensor.shape[1]}`;
+          throw `Column length mismatch. You provided a column of length ${this.kwargs["columns"].length} but data has length of ${this.row_data_tensor.shape[1]}`;
         }
       } else {
         this.columns = [ ...Array(this.row_data_tensor.shape[1]).keys() ];
diff --git a/danfojs/src/core/utils.js b/danfojs/src/core/utils.js
@@ -615,12 +615,11 @@ export class Utils {
 
   __shuffle(num, array) {
     //https://stackoverflow.com/questions/18806210/generating-non-repeating-random-numbers-in-js/18806417
-    var i = array.length,
-      j = 0,
+    var j,
       temp;
 
-    while (i--) {
-      j = Math.floor(Math.random() * (i + 1));
+    for (let i = 0; i < num; i++) {
+      j = Math.floor(Math.random() * (array.length - i)) + i;
 
       // swap randomly chosen element with current element
       temp = array[i];
diff --git a/danfojs/tests/core/utils.js b/danfojs/tests/core/utils.js
@@ -217,4 +217,20 @@ describe("Utils Functions", function () {
     });
   });
 
+  describe("__shuffle", function() {
+    it("returns array with correct shape", function() {
+      let data = [ 1, 2, 3, 4, 5 ];
+      assert.deepEqual(utils.__shuffle(3, data).length, 3);
+    });
+
+    it("returns original values when num equals total length", function() {
+      let data = [ 1, 2, 3, 4, 5 ];
+      assert.deepEqual(utils.__shuffle(5, data).sort(), [ 1, 2, 3, 4, 5 ]);
+    });
+
+    it("returns empty array when num equals zero", function() {
+      let data = [ 1, 2, 3, 4, 5 ];
+      assert.deepEqual(utils.__shuffle(0, data), []);
+    });
+  });
 });
diff --git a/package.json b/package.json
@@ -75,7 +75,8 @@
     "mocha": "^8.3.0",
     "nyc": "^15.1.0",
     "webpack": "5.21.2",
-    "webpack-cli": "^4.5.0"
+    "webpack-cli": "4.5.0",
+    "yarn": "^1.22.10"
   },
   "nyc": {
     "reporter": [

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ export default class NDframe {`
`102`	`102`	`) {`
`103`	`103`	`this.columns = this.kwargs["columns"];`
`104`	`104`	`} else {`
`105`		- throw `Column length mismatch. You provided a column of length ${this.kwargs["columns"].length} but data has lenght of ${this.row_data_tensor.shape[1]}`;
	`105`	+ throw `Column length mismatch. You provided a column of length ${this.kwargs["columns"].length} but data has length of ${this.row_data_tensor.shape[1]}`;
`106`	`106`	`}`
`107`	`107`	`} else {`
`108`	`108`	`this.columns = [ ...Array(this.row_data_tensor.shape[1]).keys() ];`