Skip to content

Commit 52ee69d

Browse files
authored
Merge pull request #358 from javascriptdata/update/tfjs
Update tensorflow version to fix M1 chip incompactibility
2 parents 65f9b37 + a5d6a42 commit 52ee69d

File tree

10 files changed

+423
-370
lines changed

10 files changed

+423
-370
lines changed

src/danfojs-base/core/datetime.ts

Lines changed: 41 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ export default class TimeSeries implements DateTime {
4646
* Returns the month, in local time.
4747
* @example
4848
* ```
49-
* import { Dataframe } from "danfojs-node"
49+
* import { Series } from "danfojs-node"
5050
* const data = [
5151
* "2019-01-01",
5252
* "2019-02-01",
5353
* "2019-03-01",
5454
* "2019-04-01",
5555
* ]
56-
* const df = new Dataframe(data)
56+
* const df = new Series(data)
5757
* const dfNew = df.dt.month()
5858
* console.log(dfNew.values)
5959
* // [1, 2, 3, 4]
@@ -68,19 +68,19 @@ export default class TimeSeries implements DateTime {
6868
* Returns the day of the week, in local time
6969
* @example
7070
* ```
71-
* import { Dataframe } from "danfojs-node"
71+
* import { Series } from "danfojs-node"
7272
* const data = [
7373
* "2019-01-01",
7474
* "2019-02-01",
7575
* "2019-03-01",
7676
* "2019-04-01",
7777
* ]
78-
* const df = new Dataframe(data)
78+
* const df = new Series(data)
7979
* const dayOfWeek = df.dt.dayOfWeek()
8080
* console.log(dayOfWeek.values)
8181
* ```
8282
*/
83-
dayOfWeek() {
83+
dayOfWeek() {
8484
const newValues = this.$dateObjectArray.map(date => date.getDay())
8585
return new Series(newValues);
8686
}
@@ -89,14 +89,14 @@ export default class TimeSeries implements DateTime {
8989
* Returns the year, in local time
9090
* @example
9191
* ```
92-
* import { Dataframe } from "danfojs-node"
92+
* import { Series } from "danfojs-node"
9393
* const data = [
9494
* "2019-01-01",
9595
* "2019-02-01",
9696
* "2021-03-01",
9797
* "2020-04-01",
9898
* ]
99-
* const df = new Dataframe(data)
99+
* const df = new Series(data)
100100
* const year = df.dt.year()
101101
* console.log(year.values)
102102
* // [2019, 2019, 2021, 2020]
@@ -111,14 +111,14 @@ export default class TimeSeries implements DateTime {
111111
* Returns the name of the month, in local time
112112
* @example
113113
* ```
114-
* import { Dataframe } from "danfojs-node"
114+
* import { Series } from "danfojs-node"
115115
* const data = [
116116
* "2019-01-01",
117117
* "2019-02-01",
118118
* "2021-03-01",
119119
* "2020-04-01",
120120
* ]
121-
* const df = new Dataframe(data)
121+
* const df = new Series(data)
122122
* const monthName = df.dt.monthName().values
123123
* console.log(monthName)
124124
* // ["January", "February", "March", "April"]
@@ -133,14 +133,14 @@ export default class TimeSeries implements DateTime {
133133
* Returns the name of the day, of the week, in local time
134134
* @example
135135
* ```
136-
* import { Dataframe } from "danfojs-node"
136+
* import { Series } from "danfojs-node"
137137
* const data = [
138138
* "2019-01-01",
139139
* "2019-02-01",
140140
* "2021-03-01",
141141
* "2020-04-01",
142142
* ]
143-
* const df = new Dataframe(data)
143+
* const df = new Series(data)
144144
* const dayOfWeekName = df.dt.dayOfWeekName().values
145145
* console.log(dayOfWeekName)
146146
* ```
@@ -154,14 +154,14 @@ export default class TimeSeries implements DateTime {
154154
* Returns the day of the month, in local time
155155
* @example
156156
* ```
157-
* import { Dataframe } from "danfojs-node"
157+
* import { Series } from "danfojs-node"
158158
* const data = [
159159
* "2019-01-01",
160160
* "2019-02-05",
161161
* "2021-03-02",
162162
* "2020-04-01",
163163
* ]
164-
* const df = new Dataframe(data)
164+
* const df = new Series(data)
165165
* const dayOfMonth = df.dt.dayOfMonth().values
166166
* console.log(dayOfMonth)
167167
* // [1, 5, 2, 1]
@@ -176,14 +176,14 @@ export default class TimeSeries implements DateTime {
176176
* Returns the hour of the day, in local time
177177
* @example
178178
* ```
179-
* import { Dataframe } from "danfojs-node"
179+
* import { Series } from "danfojs-node"
180180
* const data = [
181181
* "2019-01-01",
182182
* "2019-02-05",
183183
* "2021-03-02",
184184
* "2020-04-01",
185185
* ]
186-
* const df = new Dataframe(data)
186+
* const df = new Series(data)
187187
* const hour = df.dt.hour().values
188188
* console.log(hour)
189189
* // [0, 0, 0, 0]
@@ -198,14 +198,14 @@ export default class TimeSeries implements DateTime {
198198
* Returns the second of the day, in local time
199199
* @example
200200
* ```
201-
* import { Dataframe } from "danfojs-node"
201+
* import { Series } from "danfojs-node"
202202
* const data = [
203203
* "2019-01-01",
204204
* "2019-02-05",
205205
* "2021-03-02",
206206
* "2020-04-01",
207207
* ]
208-
* const df = new Dataframe(data)
208+
* const df = new Series(data)
209209
* const second = df.dt.second().values
210210
* console.log(second)
211211
* ```
@@ -219,14 +219,14 @@ export default class TimeSeries implements DateTime {
219219
* Returns the minute of the day, in local time
220220
* @example
221221
* ```
222-
* import { Dataframe } from "danfojs-node"
222+
* import { Series } from "danfojs-node"
223223
* const data = [
224224
* "2019-01-01",
225225
* "2019-02-05",
226226
* "2021-03-02",
227227
* "2020-04-01",
228228
* ]
229-
* const df = new Dataframe(data)
229+
* const df = new Series(data)
230230
* const minute = df.dt.minute().values
231231
* console.log(minute)
232232
* ```
@@ -236,6 +236,28 @@ export default class TimeSeries implements DateTime {
236236
return new Series(newValues);
237237
}
238238

239+
/**
240+
* Returns the Date as JavaScript standard Date object
241+
* @example
242+
* ```
243+
* import { Series } from "danfojs-node"
244+
* const data = [
245+
* "2019-01-01",
246+
* "2019-02-05",
247+
* "2021-03-02",
248+
* "2020-04-01",
249+
* ]
250+
*
251+
* const df = new Series(data)
252+
* const date = df.dt.toDate().values
253+
* console.log(date)
254+
* ```
255+
*/
256+
date() {
257+
const newValues = this.$dateObjectArray.map(date => date.toLocaleString())
258+
return new Series(newValues);
259+
}
260+
239261
}
240262

241263
export const toDateTime = (data: Series | ArrayType1D) => {

src/danfojs-base/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"author": "",
1010
"license": "ISC",
1111
"dependencies": {
12-
"@tensorflow/tfjs": "3.6.0",
13-
"@tensorflow/tfjs-node": "3.6.1",
12+
"@tensorflow/tfjs": "^3.13.0",
13+
"@tensorflow/tfjs-node": "^3.13.0",
1414
"mathjs": "^10.0.0",
1515
"papaparse": "^5.3.1",
1616
"request": "^2.88.2",

src/danfojs-base/shared/types.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,7 @@ export interface DateTime {
338338
hours(): Series
339339
seconds(): Series
340340
minutes(): Series
341+
date(): Series
341342
}
342343

343344
interface CustomConfig extends Config {

0 commit comments

Comments
 (0)