Skip to content

Commit a667793

Browse files
authored
Merge pull request #236 from Joshua-Dias-Barreto/numericalColumn
#numericalColumns now returns an array of all numerical columns
2 parents 680d904 + 28cb249 commit a667793

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

src/DataFrame-Tests/DataFrameTest.class.st

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2841,18 +2841,17 @@ DataFrameTest >> testNumericalColumnNames [
28412841
{ #category : #tests }
28422842
DataFrameTest >> testNumericalColumns [
28432843

2844-
| dataFrame expected |
2844+
| dataFrame expectedCollection |
28452845
dataFrame := DataFrame withRows:
28462846
#( #( Male 21 Argentina 94 ) #( Female 20 France 97 )
28472847
#( Female 22 Spain 95 ) #( Male 24 Portugal 99 ) ).
28482848
dataFrame columnNames: #( Gender Age Country Score ).
28492849

2850-
expected := DataFrame withRows:
2851-
#( #( 21 94 ) #( 20 97 ) #( 22 95 ) #( 24 99 ) ).
2852-
2853-
expected columnNames: #( Age Score ).
2850+
expectedCollection := {
2851+
(dataFrame columnAt: 2).
2852+
(dataFrame columnAt: 4) } asArray.
28542853

2855-
self assert: dataFrame numericalColumns equals: expected
2854+
self assert: dataFrame numericalColumns equals: expectedCollection
28562855
]
28572856

28582857
{ #category : #splitjoin }

src/DataFrame/DataFrame.class.st

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1439,7 +1439,8 @@ DataFrame >> numericalColumnNames [
14391439
DataFrame >> numericalColumns [
14401440
"Returns all numerical columns of the dataframe"
14411441

1442-
^ self columns: self numericalColumnNames
1442+
^ self columns select: [ :column |
1443+
(self dataTypes at: column name) includesBehavior: Number ]
14431444
]
14441445

14451446
{ #category : #splitjoin }

0 commit comments

Comments
 (0)