Made all the tests green. Wrote more tests for DataSeries

olekscode · olekscode · commit 77745c35fc3b · 2017-07-26T22:14:09.000+03:00
diff --git a/DataFrame-Core.package/DataSeries.class/instance/at..st b/DataFrame-Core.package/DataSeries.class/instance/at..st
@@ -0,0 +1,4 @@
+accessing
+at: aNumber
+
+	^ contents at: aNumber.
diff --git a/DataFrame-Core.package/DataSeries.class/instance/at.ifAbsent..st b/DataFrame-Core.package/DataSeries.class/instance/at.ifAbsent..st
@@ -0,0 +1,4 @@
+accessing
+at: aNumber ifAbsent: aBlock
+
+	^ contents at: aNumber ifAbsent: aBlock.
diff --git a/DataFrame-Core.package/DataSeries.class/instance/at.put..st b/DataFrame-Core.package/DataSeries.class/instance/at.put..st
@@ -0,0 +1,4 @@
+accessing
+at: aNumber put: value
+
+	contents at: aNumber put: value.
diff --git a/DataFrame-Core.package/DataSeriesInternal.class/instance/at.ifAbsent..st b/DataFrame-Core.package/DataSeriesInternal.class/instance/at.ifAbsent..st
@@ -0,0 +1,4 @@
+accessing
+at: aNumber ifAbsent: aBlock
+
+	^ contents at: aNumber ifAbsent: aBlock.
diff --git a/DataFrame-Tests.package/DataSeriesInternalTests.class/instance/testAtIfAbsent.st b/DataFrame-Tests.package/DataSeriesInternalTests.class/instance/testAtIfAbsent.st
@@ -0,0 +1,7 @@
+initialization
+testAtIfAbsent
+
+	self assert: (series at: 2) equals: 20.
+	
+	self assert: (series at: 100 ifAbsent: [ 'Executing a block' ])
+		equals: 'Executing a block'.
diff --git a/DataFrame-Tests.package/DataSeriesInternalTests.class/instance/testAtPut.st b/DataFrame-Tests.package/DataSeriesInternalTests.class/instance/testAtPut.st
@@ -1,9 +1,10 @@
 initialization
 testAtPut
 
-	| expected actual |
+	| expected |
 	
-	expected := #(10 20 30 40 50 -2 70 80 90 100).
-	actual := series at: 6 put: -2.
+	series at: 6 put: -2.	
+	expected := DataSeriesInternal fromArray:
+		#(10 20 30 40 50 -2 70 80 90 100).
 	
-	self assert: expected equals: actual.
+	self assert: series equals: expected.
diff --git a/DataFrame-Tests.package/DataSeriesMathTests.class/instance/testDotProduct.st b/DataFrame-Tests.package/DataSeriesMathTests.class/instance/testDotProduct.st
diff --git a/DataFrame-Tests.package/DataSeriesMathTests.class/instance/testMultiplyElementwise.st b/DataFrame-Tests.package/DataSeriesMathTests.class/instance/testMultiplyElementwise.st
diff --git a/DataFrame-Tests.package/DataSeriesTests.class/instance/setUp.st b/DataFrame-Tests.package/DataSeriesTests.class/instance/setUp.st
@@ -0,0 +1,4 @@
+initialization
+setUp
+
+	series := (10 to: 100 by: 10) asDataSeries.
diff --git a/DataFrame-Tests.package/DataSeriesTests.class/instance/testAsDataSeries.st b/DataFrame-Tests.package/DataSeriesTests.class/instance/testAsDataSeries.st
@@ -0,0 +1,8 @@
+tests
+testAsDataSeries
+
+	| aSeries |
+	aSeries := #(a b c) asDataSeries.
+	
+	self assert: aSeries size equals: 3.
+	self assert: aSeries asArray equals: #(a b c).
diff --git a/DataFrame-Tests.package/DataSeriesTests.class/instance/testAt.st b/DataFrame-Tests.package/DataSeriesTests.class/instance/testAt.st
@@ -0,0 +1,4 @@
+tests
+testAt
+
+	self assert: (series at: 2) equals: 20.
diff --git a/DataFrame-Tests.package/DataSeriesTests.class/instance/testAtIfAbsent.st b/DataFrame-Tests.package/DataSeriesTests.class/instance/testAtIfAbsent.st
@@ -0,0 +1,7 @@
+tests
+testAtIfAbsent
+
+	self assert: (series at: 2) equals: 20.
+	
+	self assert: (series at: 100 ifAbsent: [ 'Executing a block' ])
+		equals: 'Executing a block'.
diff --git a/DataFrame-Tests.package/DataSeriesTests.class/instance/testAtPut.st b/DataFrame-Tests.package/DataSeriesTests.class/instance/testAtPut.st
@@ -0,0 +1,9 @@
+tests
+testAtPut
+
+	| expected |
+	
+	series at: 6 put: -2.	
+	expected := #(10 20 30 40 50 -2 70 80 90 100) asDataSeries.
+	
+	self assert: series equals: expected.
diff --git a/DataFrame-Tests.package/DataSeriesTests.class/instance/testCollect.st b/DataFrame-Tests.package/DataSeriesTests.class/instance/testCollect.st
@@ -0,0 +1,11 @@
+tests
+testCollect
+
+	| actual expected |
+	
+	actual := series collect: [ :each |
+		each / 10 ].
+	
+	expected := (1 to: 10) asDataSeries.
+	
+	self assert: actual equals: expected.
diff --git a/DataFrame-Tests.package/DataSeriesTests.class/instance/testCollectWithIndex.st b/DataFrame-Tests.package/DataSeriesTests.class/instance/testCollectWithIndex.st
@@ -0,0 +1,11 @@
+tests
+testCollectWithIndex
+
+	| actual expected |
+	
+	actual := series collectWithIndex: [ :each :i |
+		each / 10 + i ].
+	
+	expected := (2 to: 20 by: 2) asDataSeries.
+	
+	self assert: actual equals: expected.
diff --git a/DataFrame-Tests.package/DataSeriesTests.class/instance/testDo.st b/DataFrame-Tests.package/DataSeriesTests.class/instance/testDo.st
@@ -0,0 +1,10 @@
+tests
+testDo
+
+	| sum |
+	sum := 0.
+	
+	series do: [ :each |
+		sum := sum + each ].
+	
+	self assert: sum equals: 550.
diff --git a/DataFrame-Tests.package/DataSeriesTests.class/instance/testDoWithIndex.st b/DataFrame-Tests.package/DataSeriesTests.class/instance/testDoWithIndex.st
@@ -0,0 +1,10 @@
+tests
+testDoWithIndex
+
+	| sum |
+	sum := 0.
+	
+	series doWithIndex: [ :each :i |
+		sum := sum + (each / i) ].
+	
+	self assert: sum equals: 100.
diff --git a/DataFrame-Tests.package/DataSeriesTests.class/instance/testFrequencyTable.st b/DataFrame-Tests.package/DataSeriesTests.class/instance/testFrequencyTable.st
@@ -1,8 +1,8 @@
 tests
 testFrequencyTable
 
-	| series expected |
-	series := #(A B C A A B C A B B) asDataSeries.
+	| aSeries expected |
+	aSeries := #(A B C A A B C A B B) asDataSeries.
 	
 	expected := DataFrame fromColumns: {
 		{ 4 . 4 . 2 } .
@@ -11,4 +11,4 @@ testFrequencyTable
 	expected rowNames: #(A B C).
 	expected columnNames: #(Count Proportion).
 	
-	self assert: series frequencyTable equals: expected
+	self assert: aSeries frequencyTable equals: expected
diff --git a/DataFrame-Tests.package/DataSeriesTests.class/instance/testVarSizeInstanceCreation.st b/DataFrame-Tests.package/DataSeriesTests.class/instance/testVarSizeInstanceCreation.st
@@ -0,0 +1,6 @@
+tests
+testVarSizeInstanceCreation
+
+	| aSeries |
+	aSeries := DataSeries new: 10.
+	self assert: aSeries size equals: 10.
diff --git a/DataFrame-Tests.package/DataSeriesTests.class/properties.json b/DataFrame-Tests.package/DataSeriesTests.class/properties.json
@@ -5,7 +5,9 @@
 	"classinstvars" : [ ],
 	"pools" : [ ],
 	"classvars" : [ ],
-	"instvars" : [ ],
+	"instvars" : [
+		"series"
+	],
 	"name" : "DataSeriesTests",
 	"type" : "normal"
 }

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +initialization
 +setUp
++
 +	series := (10 to: 100 by: 10) asDataSeries.