Merge pull request #235 from Joshua-Dias-Barreto/numericalColumn

#columns now returns an collection of series.

Author: jecisc

src/DataFrame-IO-Tests/DataFrameCsvReaderTest.class.st

@@ -106,10 +106,10 @@ DataFrameCsvReaderTest >> testReadFromString [
 	actualDataFrame := DataFrameCsvReader new readFromString: TestCsvStrings commaCsvString.
 
 	self
-		assertCollection: actualDataFrame columns first
+		assertCollection: actualDataFrame asArrayOfColumns first
 		hasSameElements: #('1:10 am' '1:30 am' '1:50 am' '2:10 am' '2:30 am').
 	self
-		assertCollection: actualDataFrame columns last
+		assertCollection: actualDataFrame asArrayOfColumns last
 		hasSameElements: #('rain' 'rain' 'snow' '-' 'rain')
 ]
 

src/DataFrame-IO/DataFrameTypeDetector.class.st

@@ -146,7 +146,7 @@ DataFrameTypeDetector >> detectColumnTypeAndConvert: anArray [
 { #category : #'public API' }
 DataFrameTypeDetector >> detectTypesAndConvert: aDataFrame [
 
-	aDataFrame columns with: aDataFrame columnNames do: [ :column :columnName |
+	aDataFrame asArrayOfColumns with: aDataFrame columnNames do: [ :column :columnName |
 		| thisColumnType |
 		"Get the user given column type for this column name and if it wasn't
 			 given then use the default type detection"

src/DataFrame-Tests/DataFrameTest.class.st

@@ -758,11 +758,10 @@ DataFrameTest >> testColumnTransformNotFound [
 DataFrameTest >> testColumns [
 
 	| expectedCollection |
-
-	expectedCollection := #(
-		(Barcelona Dubai London)
-	   (1.609 2.789 8.788)
-	   (true true false)).
+	expectedCollection := {
+		                      (df columnAt: 1).
+		                      (df columnAt: 2).
+		                      (df columnAt: 3) } asArray.
 
 	self assert: df columns equals: expectedCollection
 ]

src/DataFrame/DataFrame.class.st

@@ -543,7 +543,7 @@ DataFrame >> average [
 { #category : #'data-types' }
 DataFrame >> calculateDataTypes [
 
-	self columns doWithIndex: [ :column :i | self dataTypes at: (self columnNames at: i) put: column calculateDataType ]
+	self asArrayOfColumns doWithIndex: [ :column :i | self dataTypes at: (self columnNames at: i) put: column calculateDataType ]
 ]
 
 { #category : #comparing }
@@ -722,10 +722,9 @@ DataFrame >> columnNames: aCollection [
 
 { #category : #accessing }
 DataFrame >> columns [
-
 	"Returns a collection of all columns"
 
-	^ self asArrayOfColumns
+	^ (1 to: self numberOfColumns) collect: [ :j | self columnAt: j ]
 ]
 
 { #category : #accessing }
@@ -1053,7 +1052,7 @@ DataFrame >> hasNils [
 	"Returns true if there is atleast one nil value in the data frame. Returns false if there are no nil values in the dataframe"
 
 	| arrayOfColumns |
-	arrayOfColumns := self columns.
+	arrayOfColumns := self asArrayOfColumns.
 	1 to: self numberOfColumns do: [ :column |
 		1 to: self numberOfRows do: [ :row |
 		((arrayOfColumns at: column) at: row) ifNil: [ ^ true ] ] ].
@@ -1397,7 +1396,7 @@ DataFrame >> normalized [
 		'DataFrame will remove the dependency over normalization in the next version. You can use pharo-ai/data-preprocessing project to normalize your DataFrame and even more!'.
 	normalizers := (1 to: self anyOne size) collect: [ :e | self class defaultNormalizerClass new ].
 
-	normalizedColumns := self columns with: normalizers collect: [ :col :normalizer | col normalizedUsing: normalizer ].
+	normalizedColumns := self asArrayOfColumns with: normalizers collect: [ :col :normalizer | col normalizedUsing: normalizer ].
 
 	^ self class withColumns: normalizedColumns columnNames: self columnNames
 ]