Skip to content

Commit 2e544db

Browse files
committed
update date_range to dateRange and add docstring
1 parent a8ae166 commit 2e544db

5 files changed

Lines changed: 24 additions & 19 deletions

File tree

src/danfojs-base/core/daterange.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,11 @@ class DateRange {
130130
return dateString
131131
}
132132

133+
/**
134+
* @param date Date
135+
* @param ftype string: frequency type, month, Year, day etc
136+
* @param number
137+
*/
133138
private freqType(date: Date, ftype: string): number{
134139
let rslt: number = 0;
135140
switch (ftype){
@@ -252,15 +257,15 @@ class DateRange {
252257
}
253258

254259
/**
255-
*
260+
* Generate sequence of Dates
256261
* @param start : signify the date to start with
257262
* @param end : signify the date to end with
258263
* @param period : the total number of date to generate
259264
* @param offset : set the date range offset
260265
* @param freq: set the date range frequency and offset
261266
* @return string[]
262267
*/
263-
export default function date_range(param: Params): string[] {
268+
export default function dateRange(param: Params): string[] {
264269
const dateRange = new DateRange(param)
265270
return dateRange.range()
266271
}

src/danfojs-base/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import OneHotEncoder from "./transformers/encoders/one.hot.encoder";
2626
import getDummies from "./transformers/encoders/dummy.encoder"
2727
import concat from "./transformers/concat"
2828
import merge from "./transformers/merge"
29-
import date_range from "./core/daterange"
29+
import dateRange from "./core/daterange"
3030
import tensorflow from "./shared/tensorflowlib"
3131

3232
const __version = "1.0.0"
@@ -47,7 +47,7 @@ export {
4747
getDummies,
4848
concat,
4949
merge,
50-
date_range,
50+
dateRange,
5151
tensorflow,
5252
__version,
5353
}

src/danfojs-browser/src/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import {
2626
concat,
2727
merge,
2828
toDateTime,
29-
date_range,
29+
dateRange,
3030
tensorflow,
3131
__version,
3232
} from "../../danfojs-base";
@@ -67,7 +67,7 @@ export {
6767
getDummies,
6868
concat,
6969
merge,
70-
date_range,
70+
dateRange,
7171
tensorflow,
7272
__version,
7373
}

src/danfojs-node/src/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import {
2626
concat,
2727
merge,
2828
toDateTime,
29-
date_range,
29+
dateRange,
3030
tensorflow,
3131
__version
3232
} from "../../danfojs-base";
@@ -74,7 +74,7 @@ export {
7474
getDummies,
7575
concat,
7676
merge,
77-
date_range,
77+
dateRange,
7878
tensorflow,
7979
__version
8080
}

src/danfojs-node/test/core/daterange.test.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { assert } from "chai";
2-
import { date_range } from '../../dist/danfojs-node/src';
2+
import { dateRange } from '../../dist/danfojs-node/src';
33

44

5-
describe("date_range", function(){
5+
describe("dateRange", function(){
66

77
// it("Obtain date between start and end specified", function(){
8-
// let d = date_range({start:'2018-04-24',end:'2018-04-27'})
8+
// let d = dateRange({start:'2018-04-24',end:'2018-04-27'})
99
// let rslt = [
1010
// '4/24/2018, 1:00:00 AM',
1111
// '4/25/2018, 1:00:00 AM',
@@ -15,7 +15,7 @@ describe("date_range", function(){
1515
// assert.deepEqual(d,rslt)
1616
// });
1717
it("Obtain date between start with end not specified, but period and freq specified", function(){
18-
let d = date_range({ start:'1/1/2018', period:5, freq:'M' });
18+
let d = dateRange({ start:'1/1/2018', period:5, freq:'M' });
1919
let rslt = [
2020
'1/1/2018, 12:00:00 AM',
2121
'2/1/2018, 12:00:00 AM',
@@ -26,7 +26,7 @@ describe("date_range", function(){
2626
assert.deepEqual(d, rslt);
2727
});
2828
it("Obtain date between start with end not specified, but period and freq specified, plus offset", function(){
29-
let d = date_range({ start:'1/1/2018', period:5, freq:'3M' });
29+
let d = dateRange({ start:'1/1/2018', period:5, freq:'3M' });
3030
let rslt = [
3131
'1/1/2018, 12:00:00 AM',
3232
'4/1/2018, 12:00:00 AM',
@@ -37,7 +37,7 @@ describe("date_range", function(){
3737
assert.deepEqual(d, rslt);
3838
});
3939
it("Obtain date between start with end not specified, but period and freq specified, plus offset, longer freq", function(){
40-
let d = date_range({ start:'1/1/2018', period:5, freq:'35m' });
40+
let d = dateRange({ start:'1/1/2018', period:5, freq:'35m' });
4141
let rslt = [
4242
"1/1/2018, 12:00:00 AM",
4343
"1/1/2018, 12:35:00 AM",
@@ -48,7 +48,7 @@ describe("date_range", function(){
4848
assert.deepEqual(d, rslt);
4949
});
5050
it("Obtain date range with start not specified but end and period is given", function(){
51-
let d = date_range({ end:'1/1/2018', period:8 });
51+
let d = dateRange({ end:'1/1/2018', period:8 });
5252
let rslt = [
5353
'12/25/2017, 12:00:00 AM',
5454
'12/26/2017, 12:00:00 AM',
@@ -62,17 +62,17 @@ describe("date_range", function(){
6262
assert.deepEqual(d, rslt);
6363
});
6464
it("inputing wrong freq", function(){
65-
assert.throws(function () { date_range({ end:'1/1/2018', period:8, freq:"d" }); }, Error, 'invalid freq d');
65+
assert.throws(function () { dateRange({ end:'1/1/2018', period:8, freq:"d" }); }, Error, 'invalid freq d');
6666
});
6767
it("inputing wrong freq with offset", function(){
68-
assert.throws(function () { date_range({ end:'1/1/2018', period:8, freq:"4d" }); }, Error, 'invalid freq d');
68+
assert.throws(function () { dateRange({ end:'1/1/2018', period:8, freq:"4d" }); }, Error, 'invalid freq d');
6969
});
7070
it("inputing wrong freq offset", function(){
71-
assert.throws(function () { date_range({ end:'1/1/2018', period:8, freq:"abcm" }); }, Error, 'invalid freq offset abc');
71+
assert.throws(function () { dateRange({ end:'1/1/2018', period:8, freq:"abcm" }); }, Error, 'invalid freq offset abc');
7272
});
7373
// it("Obtain date between start and end specified with different month", function(){
7474

75-
// let d = date_range({start:'2018-04-24',end:'2018-05-27'})
75+
// let d = dateRange({start:'2018-04-24',end:'2018-05-27'})
7676
// let rslt = [
7777
// '4/24/2018, 1:00:00 AM',
7878
// '4/25/2018, 1:00:00 AM',

0 commit comments

Comments
 (0)