Implemented messages for adding rows and columns to a data frame

Author: olekscode

DataFrame-Core.package/DataFrame.class/instance/addColumn.named..st

@@ -0,0 +1,8 @@
+adding
+addColumn: anArray named: columnName
+
+	contents addColumn: anArray.
+	columnNames := columnNames copyWith: columnName.
+	
+	columnTypes := columnTypes copyWith: nil. "Extend an array"
+	self induceColumnTypeAt: (self numberOfColumns).

DataFrame-Core.package/DataFrame.class/instance/addRow.named..st

@@ -0,0 +1,6 @@
+adding
+addRow: anArray named: rowName
+
+	contents addRow: anArray.
+	rowNames := rowNames copyWith: rowName.
+	self induceColumnTypes.

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

@@ -1,12 +1,5 @@
 accessing
 at: rowNumber at: columnNumber put: value
 
-	| typeInductor |
-	
 	contents at: rowNumber at: columnNumber put: value.
-
-	typeInductor := DataTypeInductor new.
-	columnTypes at: columnNumber put:
-		(typeInductor
-			leastCommonSuperclassOf: value class
-			and: (columnTypes at: columnNumber)).
+	self induceColumnTypeAt: columnNumber.

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

@@ -1,13 +1,8 @@
 accessing
 columnAt: aNumber put: anArray
-
-	| typeInductor type |
 
 	anArray size = self numberOfRows
-		ifFalse: [ SizeMismatch signal ].
-		
-	typeInductor := DataTypeInductor new.
-	type := typeInductor typeOf: anArray.	
+		ifFalse: [ SizeMismatch signal ].	
 
 	contents columnAt: aNumber put: anArray.
-	columnTypes at: aNumber put: type.
+	self induceColumnTypeAt: aNumber.

DataFrame-Core.package/DataFrame.class/instance/induceColumnTypeAt..st

@@ -0,0 +1,9 @@
+accessing
+induceColumnTypeAt: aNumber
+"Indeces the least common superclass for all values of a column of given by its number"
+
+	| inductor type |
+	inductor := DataTypeInductor new.
+	type := inductor typeOf: (self columnAt: aNumber).
+	
+	columnTypes at: aNumber put: type.

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

@@ -1,14 +1,8 @@
 accessing
 rowAt: aNumber put: anArray
 
-	| typeInductor |
 	anArray size = self numberOfColumns
 		ifFalse: [ SizeMismatch signal ].
 
 	contents rowAt: aNumber put: anArray.
-	
-	typeInductor := DataTypeInductor new.
-	columnTypes := (1 to: self numberOfColumns) collect: [ :j |
-		typeInductor
-			leastCommonSuperclassOf: (columnTypes at: j)
-			and: (anArray at: j) class. ].
+	self induceColumnTypes.

DataFrame-Core.package/DataFrameInternal.class/instance/addColumn..st

@@ -0,0 +1,22 @@
+adding
+addColumn: anArray
+
+	| newContents |
+	
+	anArray size = self numberOfRows
+		ifFalse: [ SizeMismatch signal ].
+	
+	newContents := Matrix
+		rows: (self numberOfRows)
+		columns: (self numberOfColumns + 1).
+	
+	1 to: self numberOfRows do: [ :i |
+		1 to: self numberOfColumns do: [ :j |
+			newContents at: i at: j put:
+				(self at: i at: j) ] ].
+	
+	1 to: self numberOfRows do: [ :i |
+		newContents at: i at: (self numberOfColumns + 1)
+			put: (anArray at: i) ].
+	
+	contents := newContents.

DataFrame-Core.package/DataFrameInternal.class/instance/addRow..st

@@ -0,0 +1,22 @@
+adding
+addRow: anArray
+
+	| newContents |
+	
+	anArray size = self numberOfColumns
+		ifFalse: [ SizeMismatch signal ].
+	
+	newContents := Matrix
+		rows: (self numberOfRows + 1)
+		columns: (self numberOfColumns).
+	
+	1 to: self numberOfRows do: [ :i |
+		1 to: self numberOfColumns do: [ :j |
+			newContents at: i at: j put:
+				(self at: i at: j) ] ].
+	
+	1 to: self numberOfColumns do: [ :j |
+		newContents at: (self numberOfRows + 1) at: j
+			put: (anArray at: j) ].
+	
+	contents := newContents.

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

@@ -0,0 +1,14 @@
+tests
+testAddColumn
+
+	| expected |
+	
+	expected := DataFrameInternal fromRows: #(
+		('Barcelona' 1.609 true 9)
+   		('Dubai' 2.789 true 8)
+   		('London' 8.788 false 7)).
+		
+	df addColumn: #(9 8 7).
+	
+	self assert: df equals: expected.
+	

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

@@ -0,0 +1,8 @@
+tests
+testAddColumnSizeMismatch
+	
+	| aBlock |
+	aBlock := [ df addColumn: #(1 2 3 4) ].
+	
+	self should: aBlock raise: SizeMismatch.
+