Implemented columnAt:put:, rowAt:put: etc.

Author: olekscode

DataFrame-Core.package/DataFrame.class/class/fromCSV.separatedBy..st

@@ -13,13 +13,13 @@ fromCSV: pathToFile separatedBy: separator
 	df columnNames: (data at: 1) asArray.
 
 	"Deduce types"
-	1 to: (df columnNames size) do: [ :i | | col convertedCol |
+	"1 to: (df columnNames size) do: [ :i | | col convertedCol |
 		col := df columnAt: i.
-		convertedCol := (df columnAt: i) deduceType.
+		convertedCol := (df columnAt: i) deduceType."
 
 		"If a type was deduced"
-		( col = convertedCol ) ifFalse: [ 
+		"( col = convertedCol ) ifFalse: [ 
 			1 to: df size do: [ :j |
-				df at: j at: i put: (convertedCol at: j) ] ] ].
+				df at: j at: i put: (convertedCol at: j) ] ] ]."
 
 	^ df

DataFrame-Core.package/DataFrame.class/instance/column.put..st

@@ -0,0 +1,11 @@
+accessing
+column: colName put: anArray
+
+	| index |
+	index := self columnNames indexOf: colName.
+	
+	"If a column with that name does not exist"
+	index = 0
+		ifTrue: [ NotFoundError signal ].
+		
+	^ self columnAt: index put: anArray.

DataFrame-Core.package/DataFrame.class/instance/columnAt.put..st

@@ -0,0 +1,7 @@
+accessing
+columnAt: aNumber put: anArray
+
+	anArray size = self numberOfRows
+		ifFalse: [ SizeMismatch signal ].
+		
+	contents columnAt: aNumber put: anArray.

DataFrame-Core.package/DataFrame.class/instance/row.put..st

@@ -0,0 +1,11 @@
+accessing
+row: rowName put: anArray
+
+	| index |
+	index := self rowNames indexOf: rowName.
+	
+	"If a row with that name does not exist"
+	index = 0
+		ifTrue: [ NotFoundError signal ].
+		
+	^ self rowAt: index put: anArray.

DataFrame-Core.package/DataFrame.class/instance/rowAt.put..st

@@ -0,0 +1,7 @@
+accessing
+rowAt: aNumber put: anArray
+
+	anArray size = self numberOfColumns
+		ifFalse: [ SizeMismatch signal ].
+		
+	contents rowAt: aNumber put: anArray.

DataFrame-Core.package/DataFrameInternal.class/instance/columnAt.put..st

@@ -0,0 +1,6 @@
+accessing
+columnAt: aNumber put: anArray
+"Sets all the values of a given column equal to the values in array. It is assumed that array is of the same size as every column (number of rows). This should be tested in DataFrame"
+
+	(1 to: self numberOfRows) do: [ :i |
+		self at: i at: aNumber put: (anArray at: i) ].

DataFrame-Core.package/DataFrameInternal.class/instance/rowAt.put..st

@@ -0,0 +1,6 @@
+accessing
+rowAt: aNumber put: anArray
+"Sets all the values of a given row equal to the values in array. It is assumed that array is of the same size as every row (number of columns). This should be tested in DataFrame"
+
+	(1 to: self numberOfColumns) do: [ :j |
+		self at: aNumber at: j put: (anArray at: j) ].

DataFrame-Core.package/DataSeries.class/instance/^equals.st

@@ -0,0 +1,11 @@
+comparing
+= otherSeries
+
+	"I'm not sure if names should be considered when testing for equality"
+	self name = otherSeries name
+		ifFalse: [ ^ false ].
+		
+	self keys = otherSeries keys
+		ifFalse: [ ^ false ].
+
+	^ super = otherSeries

DataFrame-Tests.package/DataFrameInternalTests.class/instance/testColumnAtPut.st

@@ -0,0 +1,15 @@
+tests
+testColumnAtPut
+
+	| actual expected |
+
+	expected := DataFrameInternal fromRows: #(
+		('X' 1.609 0)
+   		('Y' 2.789 1)
+   		('Z' 8.788 0)).
+	
+	actual := df.
+	actual columnAt: 1 put: #(X Y Z).
+	actual columnAt: 3 put: #(0 1 0).
+	
+	self assert: actual equals: expected.

DataFrame-Tests.package/DataFrameInternalTests.class/instance/testRowAtPut.st

@@ -0,0 +1,14 @@
+tests
+testRowAtPut
+
+	| actual expected |
+
+	expected := DataFrameInternal fromRows: #(
+		('Barcelona' 1.609 true)
+   		('X' 'Y' 'Z')
+   		('London' 8.788 false)).
+	
+	actual := df.
+	actual rowAt: 2 put: #(X Y Z).
+	
+	self assert: actual equals: expected.