Merge pull request #313 from p0vidl0/dev

[enhancement] Support freq offset above 10 and above for date_range()

Author: steveoni

danfojs-browser/src/core/date_range.js

@@ -46,9 +46,11 @@ export class date_range {
         throw new Error(`invalid freq ${this.freq}`);
       }
     } else {
-      let freq_split = this.freq.split("");
-      this.offset = parseInt(freq_split[0]);
-      this.freq = freq_split[1];
+      this.offset = parseInt(this.freq.slice(0, -1));
+      if (!Number.isFinite(this.offset)){
+        throw new Error(`invalid freq offset ${this.freq.slice(0, -1)}`);
+      }
+      this.freq = this.freq.slice(-1);
       if (!this.freq_list.includes(this.freq)){
         throw new Error(`invalid freq ${this.freq}`);
       }

danfojs-browser/tests/core/date_range.js

@@ -46,6 +46,21 @@ describe("date_range", function(){
     assert.deepEqual(d, rslt);
 
 
+  });
+  it("Obtain date between start with end not specified, but period and freq specified, plus offset, longer freq", function(){
+
+    let d = new dfd.date_range({ start:'1/1/2018', period:5, freq:'35m' });
+    let rslt = [
+      "1/1/2018, 12:00:00 AM",
+      "1/1/2018, 12:35:00 AM",
+      "1/1/2018, 1:10:00 AM",
+      "1/1/2018, 1:45:00 AM",
+      "1/1/2018, 2:20:00 AM"
+    ];
+
+    assert.deepEqual(d, rslt);
+
+
   });
   it("Obtain date range with start not specified but end and period is given", function(){
 
@@ -71,4 +86,7 @@ describe("date_range", function(){
   it("inputing wrong freq with offset", function(){
     assert.throws(function () { new dfd.date_range({ end:'1/1/2018', period:8, freq:"4d" }); }, Error, 'invalid freq d');
   });
+  it("inputing wrong freq offset", function(){
+    assert.throws(function () { new dfd.date_range({ end:'1/1/2018', period:8, freq:"abcm" }); }, Error, 'invalid freq offset abc');
+  });
 });

danfojs-node/src/core/date_range.js

@@ -46,9 +46,11 @@ export class date_range {
         throw new Error(`invalid freq ${this.freq}`);
       }
     } else {
-      let freq_split = this.freq.split("");
-      this.offset = parseInt(freq_split[0]);
-      this.freq = freq_split[1];
+      this.offset = parseInt(this.freq.slice(0, -1));
+      if (!Number.isFinite(this.offset)){
+        throw new Error(`invalid freq offset ${this.freq.slice(0, -1)}`);
+      }
+      this.freq = this.freq.slice(-1);
       if (!this.freq_list.includes(this.freq)){
         throw new Error(`invalid freq ${this.freq}`);
       }

danfojs-node/tests/core/date_range.js

@@ -47,6 +47,21 @@ describe("date_range", function(){
     assert.deepEqual(d, rslt);
 
 
+  });
+  it("Obtain date between start with end not specified, but period and freq specified, plus offset, longer freq", function(){
+
+    let d = new date_range({ start:'1/1/2018', period:5, freq:'35m' });
+    let rslt = [
+      "1/1/2018, 12:00:00 AM",
+      "1/1/2018, 12:35:00 AM",
+      "1/1/2018, 1:10:00 AM",
+      "1/1/2018, 1:45:00 AM",
+      "1/1/2018, 2:20:00 AM"
+    ];
+
+    assert.deepEqual(d, rslt);
+
+
   });
   it("Obtain date range with start not specified but end and period is given", function(){
 
@@ -72,4 +87,7 @@ describe("date_range", function(){
   it("inputing wrong freq with offset", function(){
     assert.throws(function () { new date_range({ end:'1/1/2018', period:8, freq:"4d" }); }, Error, 'invalid freq d');
   });
+  it("inputing wrong freq offset", function(){
+    assert.throws(function () { new date_range({ end:'1/1/2018', period:8, freq:"abcm" }); }, Error, 'invalid freq offset abc');
+  });
 });