All tests are green! (60 tests)

olekscode · olekscode · commit 951164cb2f9b · 2017-07-09T14:08:28.000+03:00
diff --git a/DataFrame-Core.package/DataFrame.class/instance/add..st b/DataFrame-Core.package/DataFrame.class/instance/add..st
diff --git a/DataFrame-Core.package/DataFrame.class/instance/head..st b/DataFrame-Core.package/DataFrame.class/instance/head..st
@@ -0,0 +1,10 @@
+accessing
+head: aNumber
+
+	| n |
+	
+	self numberOfRows  > aNumber
+		ifTrue: [ n := aNumber ]
+		ifFalse: [ n := self numberOfRows ].
+		
+	^ self rowsAt: (1 to: n).
diff --git a/DataFrame-Core.package/DataFrame.class/instance/printOn..st b/DataFrame-Core.package/DataFrame.class/instance/printOn..st
@@ -11,16 +11,32 @@ printOn: aStream
 		separatedBy: [ aStream space ].
 	aStream nextPutAll: ']'; cr.
 				
-	1 to: self numberOfRows do: [ :i  |
+	1 to: self numberOfRows - 1 do: [ :i  |
 		(self rowNames at: i) printOn: aStream.
 		aStream tab.
-		'(' printOn: aStream.
 		
 		1 to: self numberOfColumns - 1 do: [ :j |
 			(self at: i at: j) printOn: aStream.
 			aStream space ].
 		
 		"Last one without a space"
-		(self at: i at: (self numberOfColumns)) printOn: aStream.
-		')' printOn: aStream.
-		aStream cr ].
+		(self at: i
+			at: self numberOfColumns)
+			printOn: aStream.
+		
+		aStream cr ].
+	
+	"Last one without new line"
+	(self rowNames at: self numberOfRows) printOn: aStream.
+	aStream tab.
+		
+	1 to: self numberOfColumns - 1 do: [ :j |
+		(self at: self numberOfRows at: j) printOn: aStream.
+		aStream space ].
+		
+	"Last one without a space"
+	(self
+		at: self numberOfRows
+		at: self numberOfColumns)
+		printOn: aStream.
+		aStream space.
diff --git a/DataFrame-Core.package/DataFrame.class/instance/setDefaultRowColumnNames.st b/DataFrame-Core.package/DataFrame.class/instance/setDefaultRowColumnNames.st
@@ -1,4 +1,4 @@
-initialization
+private
 setDefaultRowColumnNames
 
 	self rowNames: (1 to: self numberOfRows) asArray.
diff --git a/DataFrame-Core.package/DataFrame.class/instance/tail..st b/DataFrame-Core.package/DataFrame.class/instance/tail..st
@@ -0,0 +1,12 @@
+accessing
+tail: aNumber
+
+	| n rows |
+	
+	rows := self numberOfRows.
+	
+	rows > aNumber
+		ifTrue: [ n := aNumber ]
+		ifFalse: [ n := rows ].
+			
+	^ self rowsAt: ((rows - n + 1) to: rows).
diff --git a/DataFrame-Tests.package/DataFrameStatsTests.class/instance/testAverage.st b/DataFrame-Tests.package/DataFrameStatsTests.class/instance/testAverage.st
diff --git a/DataFrame-Tests.package/DataFrameStatsTests.class/instance/testMax.st b/DataFrame-Tests.package/DataFrameStatsTests.class/instance/testMax.st
diff --git a/DataFrame-Tests.package/DataFrameStatsTests.class/instance/testMin.st b/DataFrame-Tests.package/DataFrameStatsTests.class/instance/testMin.st
diff --git a/DataFrame-Tests.package/DataSetsTests.class/README.md b/DataFrame-Tests.package/DataSetsTests.class/README.md
diff --git a/DataFrame-Tests.package/DataSetsTests.class/instance/testLoadHousing.st b/DataFrame-Tests.package/DataSetsTests.class/instance/testLoadHousing.st
@@ -0,0 +1,25 @@
+tests
+testLoadHousing
+	
+	| df expectedSeries |
+	df := DataFrame loadHousing.
+	
+	"First we check if the dimensions are equal to what we expected"
+	self assert: df numberOfRows equals: 489.
+	self assert: df numberOfColumns equals: 4.
+	
+	"Then we check the row and column names"
+	self assert: df columnNames equals: #(RM LSTAT PTRATIO MDEV).
+	self assert: df rowNames equals: (1 to: df numberOfRows).
+	
+	"First row (any row) should be a data series with name corresponding to the row name and keys equal to column names"
+	expectedSeries := #(6.575 4.98 15.3 504000.0) asDataSeries.
+	expectedSeries name: 1.
+	expectedSeries keys: df columnNames.
+	
+	self assert: (df row: 1) equals: expectedSeries.
+	
+	"First column (any column) should be a data series with name corresponding to the column name and keys equal to row names. We don't want to check all the values manually, so we just look at the mean"
+	self assert: (df column: #RM) average closeTo: 6.24.
+	self assert: (df column: #RM) name equals: #RM.
+	self assert: (df column: #RM) keys equals: df rowNames.
diff --git a/DataFrame-Tests.package/DataSetsTests.class/instance/testLoadIris.st b/DataFrame-Tests.package/DataSetsTests.class/instance/testLoadIris.st
@@ -0,0 +1,25 @@
+tests
+testLoadIris
+	
+	| df expectedSeries |
+	df := DataFrame loadIris.
+	
+	"First we check if the dimensions are equal to what we expected"
+	self assert: df numberOfRows equals: 150.
+	self assert: df numberOfColumns equals: 5.
+	
+	"Then we check the row and column names"
+	self assert: df columnNames equals: #(sepal_length sepal_width petal_length petal_width species).
+	self assert: df rowNames equals: (1 to: df numberOfRows).
+	
+	"First row (any row) should be a data series with name corresponding to the row name and keys equal to column names"
+	expectedSeries := #(5.1 3.5 1.4 0.2 setosa) asDataSeries.
+	expectedSeries name: 1.
+	expectedSeries keys: df columnNames.
+	
+	self assert: (df row: 1) equals: expectedSeries.
+	
+	"First column (any column) should be a data series with name corresponding to the column name and keys equal to row names. We don't want to check all the values manually, so we just look at the mean"
+	self assert: (df column: #sepal_length) average closeTo: 5.843.
+	self assert: (df column: #sepal_length) name equals: #sepal_length.
+	self assert: (df column: #sepal_length) keys equals: df rowNames.
diff --git a/DataFrame-Tests.package/DataSetsTests.class/properties.json b/DataFrame-Tests.package/DataSetsTests.class/properties.json
@@ -6,6 +6,6 @@
 	"pools" : [ ],
 	"classvars" : [ ],
 	"instvars" : [ ],
-	"name" : "DataFrameStatsTests",
+	"name" : "DataSetsTests",
 	"type" : "normal"
 }
diff --git a/DataFrame-Tests.package/DataSlicerTests.class/instance/setUp.st b/DataFrame-Tests.package/DataSlicerTests.class/instance/setUp.st
@@ -0,0 +1,5 @@
+initialization
+setUp
+
+	df := DataFrame loadIris.
+	series := df column: #sepal_length.
diff --git a/DataFrame-Tests.package/DataSlicerTests.class/instance/testDataFrameHead.st b/DataFrame-Tests.package/DataSlicerTests.class/instance/testDataFrameHead.st
@@ -1,19 +1,17 @@
 tests
 testDataFrameHead
 
-	| df slice dfExpected |
-	df := DataFrame fromRows: 
-		((1 to: 20) collect: [ :i |
-			{ i * 10 . i * 100 } ]).
+	| actual expected |
 	
-	slice := df head.
-
-	self assert: (slice isKindOf: DataFrame).
-	self assert: slice size equals: df defaultHeadTailSize.
+	expected := DataFrame fromRows: #(
+		(5.1 3.5 1.4 0.2 setosa)
+		(4.9 3 1.4 0.2 setosa)
+		(4.7 3.2 1.3 0.2 setosa)
+		(4.6 3.1 1.5 0.2 setosa)
+		(5 3.6 1.4 0.2 setosa)).
+	expected columnNames: df columnNames.
+	expected rowNames: (1 to: df defaultHeadTailSize).
 	
-	dfExpected := DataFrame rows:
-		((1 to: df defaultHeadTailSize)
-			collect: [ :i |
-				{ i * 10 . i * 100 } ]).
+	actual := df head.
 			
-	self assert: slice equals: dfExpected.
+	self assert: actual equals: expected.
diff --git a/DataFrame-Tests.package/DataSlicerTests.class/instance/testDataFrameHeadN.st b/DataFrame-Tests.package/DataSlicerTests.class/instance/testDataFrameHeadN.st
@@ -1,18 +1,15 @@
 tests
 testDataFrameHeadN
 
-	| df slice dfExpected |
-	df := DataFrame fromRows: 
-		((1 to: 20) collect: [ :i |
-			{ i * 10 . i * 100 } ]).
+	| actual expected |
 	
-	slice := df head: 3.
-
-	self assert: (slice isKindOf: DataFrame).
+	expected := DataFrame fromRows: #(
+		(5.1 3.5 1.4 0.2 setosa)
+		(4.9 3 1.4 0.2 setosa)
+		(4.7 3.2 1.3 0.2 setosa)).
+	expected columnNames: df columnNames.
+	expected rowNames: (1 to: 3).
 	
-	dfExpected := DataFrame rows:
-		((1 to: 3)
-			collect: [ :i |
-				{ i * 10 . i * 100 } ]).
+	actual := df head: 3.
 			
-	self assert: slice equals: dfExpected.
+	self assert: actual equals: expected.
diff --git a/DataFrame-Tests.package/DataSlicerTests.class/instance/testDataFrameTail.st b/DataFrame-Tests.package/DataSlicerTests.class/instance/testDataFrameTail.st
@@ -1,21 +1,20 @@
 tests
 testDataFrameTail
 
-	| df slice dfExpected |
-	df := DataFrame fromRows: 
-		((1 to: 20) collect: [ :i |
-			{ i * 10 . i * 100 } ]).
+	| actual expected rows |
 	
-	slice := df tail.
-
-	self assert: (slice isKindOf: DataFrame).
-	self assert: slice size equals: df defaultHeadTailSize.
+	expected := DataFrame fromRows: #(
+		(6.7 3 5.2 2.3 virginica)
+		(6.3 2.5 5 1.9 virginica)
+		(6.5 3 5.2 2 virginica)
+		(6.2 3.4 5.4 2.3 virginica)
+		(5.9 3 5.1 1.8 virginica)).
+	expected columnNames: df columnNames.
 	
-	dfExpected := DataFrame rows:
-		((df size - df defaultHeadTailSize + 1 to: df size)
-			collect: [ :i |
-				{ i * 10 . i * 100 } ]).
+	rows := df numberOfRows.
+	expected rowNames:
+		(rows - df defaultHeadTailSize + 1 to: rows).
 	
-	dfExpected keys: (df size - df defaultHeadTailSize + 1 to: df size).
+	actual := df tail.
 			
-	self assert: slice equals: dfExpected.
+	self assert: actual equals: expected.
diff --git a/DataFrame-Tests.package/DataSlicerTests.class/instance/testDataFrameTailN.st b/DataFrame-Tests.package/DataSlicerTests.class/instance/testDataFrameTailN.st
@@ -1,19 +1,18 @@
 tests
 testDataFrameTailN
 
-	| df slice dfExpected |
-	df := DataFrame fromRows: 
-		((1 to: 20) collect: [ :i |
-			{ i * 10 . i * 100 } ]).
+	| actual expected rows |
 	
-	slice := df tail: 3.
-
-	self assert: (slice isKindOf: DataFrame).
+	expected := DataFrame fromRows: #(
+		(6.5 3 5.2 2 virginica)
+		(6.2 3.4 5.4 2.3 virginica)
+		(5.9 3 5.1 1.8 virginica)).
+	expected columnNames: df columnNames.
+	
+	rows := df numberOfRows.
+	expected rowNames:
+		(rows - 3 + 1 to: rows).
 	
-	dfExpected := DataFrame rows:
-		((df size - 3 + 1 to: df size)
-			collect: [ :i |
-				{ i * 10 . i * 100 } ]).
-	dfExpected keys: #(18 19 20).
+	actual := df tail: 3.
 			
-	self assert: slice equals: dfExpected.
+	self assert: actual equals: expected.
diff --git a/DataFrame-Tests.package/DataSlicerTests.class/instance/testDataSeriesHead.st b/DataFrame-Tests.package/DataSlicerTests.class/instance/testDataSeriesHead.st
@@ -1,11 +1,12 @@
 tests
 testDataSeriesHead
 
-	| series slice |
-	series := (10 to: 100 by: 10) asDataSeries.
+	| actual expected |
 	
-	slice := series head.
+	expected := #(5.1 4.9 4.7 4.6 5) asDataSeries.
+	expected name: series name.
+	expected keys: (1 to: series defaultHeadTailSize).
+	
+	actual := series head.
 
-	self assert: (slice isKindOf: DataSeries).
-	self assert: slice size equals: series defaultHeadTailSize.
-	self assert: slice equals: (10 to: 50 by: 10) asDataSeries.
+	self assert: actual equals: expected.
diff --git a/DataFrame-Tests.package/DataSlicerTests.class/instance/testDataSeriesHeadN.st b/DataFrame-Tests.package/DataSlicerTests.class/instance/testDataSeriesHeadN.st
@@ -1,10 +1,12 @@
 tests
 testDataSeriesHeadN
 
-	| series slice |
-	series := (10 to: 100 by: 10) asDataSeries.
+	| actual expected |
 	
-	slice := series head: 3.
+	expected := #(5.1 4.9 4.7) asDataSeries.
+	expected name: series name.
+	expected keys: (1 to: 3).
+	
+	actual := series head: 3.
 
-	self assert: (slice isKindOf: DataSeries).
-	self assert: slice equals: (10 to: 30 by: 10) asDataSeries.
+	self assert: actual equals: expected.
diff --git a/DataFrame-Tests.package/DataSlicerTests.class/instance/testDataSeriesTail.st b/DataFrame-Tests.package/DataSlicerTests.class/instance/testDataSeriesTail.st
@@ -1,11 +1,13 @@
 tests
 testDataSeriesTail
 
-	| series slice |
-	series := (10 to: 100 by: 10) asDataSeries.
+	| actual expected |
 	
-	slice := series tail.
+	expected := #(6.7 6.3 6.5 6.2 5.9) asDataSeries.
+	expected name: series name.
+	expected keys:
+		(series size - series defaultHeadTailSize + 1 to: series size).
+	
+	actual := series tail.
 
-	self assert: (slice isKindOf: DataSeries).
-	self assert: slice size equals: series defaultHeadTailSize.
-	self assert: slice equals: { 6->60 . 7->70 . 8->80 . 9->90 . 10->100 } asDataSeries.
+	self assert: actual equals: expected.
diff --git a/DataFrame-Tests.package/DataSlicerTests.class/instance/testDataSeriesTailN.st b/DataFrame-Tests.package/DataSlicerTests.class/instance/testDataSeriesTailN.st
diff --git a/DataFrame-Tests.package/DataSlicerTests.class/properties.json b/DataFrame-Tests.package/DataSlicerTests.class/properties.json

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-initialization`
	`1`	`+private`
`2`	`2`	`setDefaultRowColumnNames`
`3`	`3`
`4`	`4`	`self rowNames: (1 to: self numberOfRows) asArray.`