59-DataSeries-should-be-a-subclass-of-OrderedDictionary

src/DataFrame-Tests/DataFrameAggrGroupTest.class.st

@@ -25,24 +25,25 @@ DataFrameAggrGroupTest >> testAggregateAverage [
 
 	| expected actual |
 
-	expected := #(18.3433 20.79) asDataSeries.
-	expected keys: #(Male Female).
+	expected := DataSeries 
+		withKeys: #(Male Female)
+		values: #(18.3433 20.79)
+		name: #total_bill.
 
 	actual := (df group: #total_bill by: #sex) average.
-
 	self assert: actual closeTo: expected.
 ]
 
 { #category : #initialization }
 DataFrameAggrGroupTest >> testAggregateMax [
-
 	| expected actual |
 
-	expected := #(23.68 24.59) asDataSeries.
-	expected keys: #(Male Female).
+	expected := DataSeries 
+		withKeys: #(Male Female)
+		values: #(23.68 24.59)
+		name: #total_bill.
 
 	actual := (df group: #total_bill by: #sex) max.
-
 	self assert: actual equals: expected.
 ]
 
@@ -51,11 +52,12 @@ DataFrameAggrGroupTest >> testAggregateMin [
 
 	| expected actual |
 
-	expected := #(10.34 16.99) asDataSeries.
-	expected keys: #(Male Female).
+	expected := DataSeries 
+		withKeys: #(Male Female)
+		values: #(10.34 16.99)
+		name: #total_bill.
 
 	actual := (df group: #total_bill by: #sex) min.
-
 	self assert: actual equals: expected.
 ]
 
@@ -78,37 +80,19 @@ DataFrameAggrGroupTest >> testDataFrameGroupedPrintOn [
 	self assert: actual equals: expected.
 ]
 
-{ #category : #initialization }
-DataFrameAggrGroupTest >> testDataSeriesGroupedPrintOn [
-
-	| expected actual |
-
-	expected := String new writeStream.
-	expected
-		nextPutAll: 'a DataSeriesGrouped'; cr;
-		nextPutAll: ('Male: a DataSeries [3 items]'); cr;
-		nextPutAll: ('Female: a DataSeries [2 items]').
-	expected := expected contents.
-
-	actual := String new writeStream.
-	(df group: #total_bill by: #sex) printOn: actual.
-	actual := actual contents.
-
-	self assert: actual equals: expected.
-]
-
 { #category : #tests }
 DataFrameAggrGroupTest >> testGroupSeriesBySeries [
 
-	| femaleGroup maleGroup expectedSeries actualSeries |
+	| femaleGroup maleGroup expected actual |
 
 	femaleGroup := #(16.99 24.59) asDataSeries.
 	maleGroup := #(10.34 21.01 23.68) asDataSeries.
 
-	expectedSeries := { maleGroup . femaleGroup } asDataSeries.
-	expectedSeries keys: #(Male Female).
+	expected := DataSeries 
+		withKeys: #(Male Female)
+		values: { maleGroup . femaleGroup }
+		name: #total_bill.
 
-	actualSeries := (df group: #total_bill by: #sex) groups.
-
-self assert: actualSeries equals: expectedSeries.
+	actual := (df group: #total_bill by: #sex) groups.
+	self assert: actual equals: expected.
 ]

src/DataFrame-Tests/DataFrameHeadTailTest.class.st

@@ -104,64 +104,6 @@ DataFrameHeadTailTest >> testDataFrameTailN [
 	self assert: actual equals: expected.
 ]
 
-{ #category : #tests }
-DataFrameHeadTailTest >> testDataSeriesHead [
-
-	| actual expected |
-
-	expected := #(5.1 4.9 4.7 7 6.4) asDataSeries.
-	expected name: series name.
-	expected keys: (1 to: series defaultHeadTailSize).
-
-	actual := series head.
-
-	self assert: actual equals: expected.
-]
-
-{ #category : #tests }
-DataFrameHeadTailTest >> testDataSeriesHeadN [
-
-	| actual expected |
-
-	expected := #(5.1 4.9 4.7) asDataSeries.
-	expected name: series name.
-	expected keys: (1 to: 3).
-
-	actual := series head: 3.
-
-	self assert: actual equals: expected.
-]
-
-{ #category : #tests }
-DataFrameHeadTailTest >> testDataSeriesTail [
-
-	| actual expected |
-
-	expected := #(6.4 6.9 6.3 5.8 7.1) asDataSeries.
-	expected name: series name.
-	expected keys:
-		(series size - series defaultHeadTailSize + 1 to: series size).
-
-	actual := series tail.
-
-	self assert: actual equals: expected.
-]
-
-{ #category : #tests }
-DataFrameHeadTailTest >> testDataSeriesTailN [
-
-	| actual expected |
-
-	expected := #(6.3 5.8 7.1) asDataSeries.
-	expected name: series name.
-	expected keys:
-		(series size - 3 + 1 to: series size).
-
-	actual := series tail: 3.
-
-	self assert: actual equals: expected.
-]
-
 { #category : #tests }
 DataFrameHeadTailTest >> testDefaultHeadTailSize [
 

src/DataFrame-Tests/DataFrameQueriesTest.class.st

@@ -44,7 +44,7 @@ DataFrameQueriesTest >> testSelect [
 
 	actual := df
 		select: [ :row |
-			(row atKey: #a) = 'x' and: (row atKey: #b) < 30 ].
+			(row at: #a) = 'x' and: (row at: #b) < 30 ].
 
 	expected := DataFrame withRows: #(
 		(x 10 0.25 0.1)

src/DataFrame-Tests/DataFrameStatsTest.class.st

@@ -107,7 +107,7 @@ DataFrameStatsTest >> testMode [
 
 	| expected actual |
 
-	expected := { 4.7 . 3.2 . 1.4 . 0.2 } asDataSeries.
+	expected := { 6.3 . 3.2 . 1.4 . 0.2 } asDataSeries.
 	expected name: #mode.
 	expected keys: df columnNames.
 

src/DataFrame-Tests/DataFrameTest.class.st

@@ -388,9 +388,9 @@ DataFrameTest >> testCollect [
 	expectedResult columnNames: #(City Population).
 
 	actualResult := df collect: [ :row |
-		row atKey: #City put: (row atKey: #City) asUppercase.
-		row atKey: #Population put: (row atKey: #Population) asInteger.
-		row removeAtKey: #BeenThere.
+		row at: #City put: (row at: #City) asUppercase.
+		row at: #Population put: (row at: #Population) asInteger.
+		row removeAt: #BeenThere.
 		row ].
 
 	self assert: actualResult equals: expectedResult.