Merge pull request #255 from Joshua-Dias-Barreto/markdownPrinter

Fixed #106. DataFrame>> #addRow: now considers key ordering

Author: jecisc

src/DataFrame-Tests/DataFrameTest.class.st

@@ -236,6 +236,28 @@ DataFrameTest >> testAddRowAtPosition [
 	self assert: df equals: expected
 ]
 
+{ #category : #tests }
+DataFrameTest >> testAddRowAtPositionWithKeysAsColumnNames [
+	| row expected |
+
+	row := DataSeries
+		       withKeys: #( 'Population' 'BeenThere' 'City' )
+		       values: #( 2.141 true Paris )
+		       name: 'X'.
+	df addRow: row atPosition: 2.
+
+	expected := DataFrame withRows: #(
+		(Barcelona 1.609 true)
+		(Paris 2.141 true)
+   		(Dubai 2.789 true)
+   		(London 8.788 false)).
+
+	expected rowNames: #(A X B C).
+	expected columnNames: #(City Population BeenThere).
+
+	self assert: df equals: expected
+]
+
 { #category : #tests }
 DataFrameTest >> testAddRowNameMustBeDistinct [
 
@@ -295,6 +317,28 @@ DataFrameTest >> testAddRowSizeMismatch [
 	self should: aBlock raise: SizeMismatch
 ]
 
+{ #category : #tests }
+DataFrameTest >> testAddRowWithKeysAsColumnNames [
+
+	| row expected |
+	row := DataSeries
+		       withKeys: #( 'Population' 'BeenThere' 'City' )
+		       values: #( 2.141 true Paris )
+		       name: 'X'.
+	df addRow: row.
+
+	expected := DataFrame withRows:
+		            #( #( Barcelona 1.609 true ) 
+							#( Dubai 2.789 true )
+		               #( London 8.788 false ) 
+							#( Paris 2.141 true ) ).
+
+	expected rowNames: #( A B C X ).
+	expected columnNames: #( City Population BeenThere ).
+
+	self assert: df equals: expected
+]
+
 { #category : #tests }
 DataFrameTest >> testApplyElementwise [
 

src/DataFrame/DataFrame.class.st

@@ -397,13 +397,23 @@ DataFrame >> addEmptyRowNamed: aString atPosition: aNumber [
 { #category : #adding }
 DataFrame >> addRow: aDataSeries [
 	"Add DataSeries as a new row at the end"
-	self addRow: aDataSeries asArray named: aDataSeries name
+
+	self addRow: aDataSeries atPosition: self numberOfRows + 1
 ]
 
 { #category : #adding }
 DataFrame >> addRow: aDataSeries atPosition: aNumber [
 	"Add DataSeries as a new row at the given position"
-	self addRow: aDataSeries named: aDataSeries name atPosition: aNumber
+
+	| row |
+	row := Array new: self columnNames size.
+	self columnNames withIndexDo: [ :columnName :index |
+		| value |
+		value := aDataSeries
+			         at: columnName
+			         ifAbsent: [ aDataSeries atIndex: index ].
+		row at: index put: value ].
+	self addRow: row named: aDataSeries name atPosition: aNumber
 ]
 
 { #category : #adding }
@@ -2164,7 +2174,7 @@ DataFrame >> size [
 { #category : #sorting }
 DataFrame >> sortBy: columnName [
 	"Rearranges the rows of the data frame in ascending order of the values in the column named columnName"
-	
+
 	self sortBy: columnName using: [ :a :b | a <= b ]
 ]