Skip to content

Commit eb44a91

Browse files
committed
Moved groups instant variable to DataGrouped class. Wrote a test for grouping series by series
1 parent 7af600b commit eb44a91

File tree

8 files changed

+47
-7
lines changed

8 files changed

+47
-7
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
"classinstvars" : [ ],
66
"pools" : [ ],
77
"classvars" : [ ],
8-
"instvars" : [
9-
"groups"
10-
],
8+
"instvars" : [ ],
119
"name" : "DataFrameGrouped",
1210
"type" : "normal"
1311
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
accessing
2+
groups
3+
4+
^ groups

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
"classinstvars" : [ ],
66
"pools" : [ ],
77
"classvars" : [ ],
8-
"instvars" : [ ],
8+
"instvars" : [
9+
"groups"
10+
],
911
"name" : "DataGrouped",
1012
"type" : "normal"
1113
}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
"classinstvars" : [ ],
66
"pools" : [ ],
77
"classvars" : [ ],
8-
"instvars" : [
9-
"groups"
10-
],
8+
"instvars" : [ ],
119
"name" : "DataSeriesGrouped",
1210
"type" : "normal"
1311
}

DataFrame-Tests.package/DataFrameAggrGroupTests.class/README.md

Whitespace-only changes.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
initialization
2+
setUp
3+
4+
df := DataFrame fromRows:
5+
#((16.99 1.01 'Female' 'No' 'Sun' 'Dinner' 2)
6+
(10.34 1.66 'Male' 'No' 'Sun' 'Dinner' 3)
7+
(21.01 3.5 'Male' 'No' 'Sun' 'Dinner' 3)
8+
(23.68 3.31 'Male' 'No' 'Sun' 'Dinner' 2)
9+
(24.59 3.61 'Female' 'No' 'Sun' 'Dinner' 4)).
10+
11+
df columnNames: #('total_bill' 'tip' 'sex' 'smoker' 'day' 'time' 'size').
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
tests
2+
testGroupSeriesBySeries
3+
4+
| femaleGroup maleGroup expectedSeries actualSeries |
5+
6+
femaleGroup := #(16.99 24.59) asDataSeries.
7+
maleGroup := #(10.34 21.01 23.68) asDataSeries.
8+
9+
expectedSeries := { femaleGroup . maleGroup } asDataSeries.
10+
expectedSeries keys: #('Female' 'Male').
11+
12+
actualSeries := (df group: #total_bill by: #sex) groups.
13+
14+
self assert: actualSeries equals: expectedSeries.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"commentStamp" : "",
3+
"super" : "TestCase",
4+
"category" : "DataFrame-Tests",
5+
"classinstvars" : [ ],
6+
"pools" : [ ],
7+
"classvars" : [ ],
8+
"instvars" : [
9+
"df"
10+
],
11+
"name" : "DataFrameAggrGroupTests",
12+
"type" : "normal"
13+
}

0 commit comments

Comments
 (0)