Skip to content

Commit 02f47db

Browse files
committed
Redesigned DataSeries to be a subclass of PMVector
1 parent 951164c commit 02f47db

File tree

28 files changed

+49
-153
lines changed

28 files changed

+49
-153
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
enumerating
2+
do: aBlock
3+
"We enumerate through the data enrties - through rows of a data frame"
4+
5+
1 to: self numberOfRows do: [ :i |
6+
aBlock value: (self rowAt: i) ].

DataFrame-Core.package/DataSeries.class/instance/from.to..st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ from: start to: end
33

44
| series |
55
series := ((start to: end) collect: [ :i |
6-
self at: (self keyAtIndex: i) ]) asDataSeries.
6+
self at: i]) asDataSeries.
77

88
series name: self name.
99
series keys: (self keys copyFrom: start to: end).

DataFrame-Core.package/TDataSlicer.trait/instance/head..st renamed to DataFrame-Core.package/DataSeries.class/instance/head..st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ head: aNumber
33

44
| n |
55

6-
( self size > aNumber )
6+
self size > aNumber
77
ifTrue: [ n := aNumber ]
88
ifFalse: [ n := self size ].
99

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
accessing
2+
keys: anArray
3+
4+
keys := anArray
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
accessing
2+
keys
3+
4+
^ keys

DataFrame-Core.package/TDataSlicer.trait/instance/tail..st renamed to DataFrame-Core.package/DataSeries.class/instance/tail..st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ tail: aNumber
33

44
| n |
55

6-
( self size > aNumber )
6+
self size > aNumber
77
ifTrue: [ n := aNumber ]
88
ifFalse: [ n := self size ].
99

DataFrame-Core.package/DataSeries.class/properties.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
{
2-
"classtraitcomposition" : "TDataSlicer classTrait + TDataIndexer classTrait + TDataSequenceable classTrait + TSortable classTrait",
2+
"classtraitcomposition" : "TDataSlicer classTrait",
33
"classvars" : [ ],
44
"instvars" : [
5-
"name"
5+
"name",
6+
"keys"
67
],
78
"name" : "DataSeries",
89
"commentStamp" : "<historical>",
9-
"super" : "OrderedDictionary",
10-
"traitcomposition" : "TDataSlicer + TDataIndexer + TDataSequenceable + TSortable",
11-
"type" : "normal",
10+
"super" : "PMVector",
11+
"traitcomposition" : "TDataSlicer",
12+
"type" : "variable",
1213
"classinstvars" : [ ],
1314
"pools" : [ ],
1415
"category" : "DataFrame-Core"

DataFrame-Core.package/DataSeriesNumeric.class/properties.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
"classvars" : [ ],
88
"instvars" : [ ],
99
"name" : "DataSeriesNumeric",
10-
"type" : "normal"
10+
"type" : "variable"
1111
}

DataFrame-Core.package/DataSeriesText.class/properties.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
"classvars" : [ ],
88
"instvars" : [ ],
99
"name" : "DataSeriesText",
10-
"type" : "normal"
10+
"type" : "variable"
1111
}

DataFrame-Core.package/TDataIndexer.trait/README.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)