Skip to content

Commit eb871f3

Browse files
committed
Improved the differentiation of different types of DataSeries
1 parent eb44a91 commit eb871f3

File tree

11 files changed

+81
-22
lines changed

11 files changed

+81
-22
lines changed
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
instance creation
2+
fromSeries: aSeries
3+
4+
| series |
5+
series := self newFrom: aSeries.
6+
7+
series keys: aSeries keys.
8+
series name: aSeries name.
9+
10+
^ series
11+
12+
Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,12 @@
11
instance creation
2-
newFrom: aCollection
2+
newFrom: anArray
3+
"Every subclass overrides this method and converts the data to a specific type"
34

4-
| df |
5+
| series |
6+
series := self new: (anArray size).
57

6-
((aCollection isKindOf: Dictionary) or:
7-
(aCollection isKindOf: OrderedDictionary))
8-
ifTrue: [ ^ super newFrom: aCollection ].
9-
10-
"If all the values are associations"
11-
aCollection
12-
detect: [ :each |
13-
(each isKindOf: Association) not ]
14-
ifNone: [ ^ super newFrom: aCollection ].
15-
16-
17-
df := self new.
18-
19-
aCollection doWithIndex: [ :value :i |
20-
df at: i put: value ].
21-
22-
^ df
8+
anArray doWithIndex: [ :each :i |
9+
series at: i put: each ].
2310

11+
^ series
2412

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
converting
2-
asDataSeries
3-
"Answer self since the receiver is a data series."
4-
^ self
2+
asDataSeries
3+
4+
^ DataSeries newFrom: self.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
converting
2+
asDataSeriesNumeric
3+
4+
^ DataSeriesNumeric newFrom: self.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
converting
2+
asDataSeriesText
3+
4+
^ DataSeriesText newFrom: self.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
converting
2+
asDataSeriesTime
3+
4+
^ DataSeriesTime newFrom: self.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
instance creation
2+
newFrom: anArray
3+
"Every subclass of DataSeries overrides this method and converts the data to a specific type"
4+
5+
| series |
6+
series := self new: (anArray size).
7+
8+
anArray doWithIndex: [ :each :i |
9+
series at: i put: each asNumber ].
10+
11+
^ series
12+
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
instance creation
2+
newFrom: anArray
3+
"Every subclass of DataSeries overrides this method and converts the data to a specific type"
4+
5+
| series |
6+
series := self new: (anArray size).
7+
8+
anArray doWithIndex: [ :each :i |
9+
series at: i put: each asString ].
10+
11+
^ series
12+

DataFrame-Core.package/DataSeriesTime.class/README.md

Whitespace-only changes.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
instance creation
2+
newFrom: anArray
3+
"Every subclass of DataSeries overrides this method and converts the data to a specific type"
4+
5+
| series |
6+
series := self new: (anArray size).
7+
8+
anArray doWithIndex: [ :each :i |
9+
series at: i put: (DateAndTime fromString: each) ].
10+
11+
^ series
12+

0 commit comments

Comments
 (0)