Skip to content

Commit 07d97ca

Browse files
authored
Merge branch 'master' into add_shuffling
2 parents 4878ce3 + f085adf commit 07d97ca

File tree

3 files changed

+25
-8
lines changed

3 files changed

+25
-8
lines changed

src/DataFrame-Tests/DataSeriesTest.class.st

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2297,8 +2297,8 @@ DataSeriesTest >> testStatsSummary [
22972297
| expected actual |
22982298

22992299
expected := DataSeries
2300-
withKeys: #(Min '1st Qu.' Median Average '3rd Qu.' Max)
2301-
values: { 3 . 7 . 9 . (115 / 11) . 15 . 20 }
2300+
withKeys: #(Count Average Stdev Min '25%' '50%' '75%' Max)
2301+
values: { 11 . series values average . series values stdev . 3 . 7 . 9 . 15 . 20 }
23022302
name: series name.
23032303

23042304
actual := series summary.

src/DataFrame/DataFrame.class.st

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2577,7 +2577,20 @@ DataFrame >> stdev [
25772577
^ self applyToAllColumns: #stdev
25782578
]
25792579

2580-
{ #category : 'accessing' }
2580+
{ #category : #statistics }
2581+
DataFrame >> summary [
2582+
| summaryFrame |
2583+
summaryFrame := nil.
2584+
self columnNames do: [ :column |
2585+
((self dataTypeOfColumn: column) inheritsFrom: Number)
2586+
ifTrue: [
2587+
summaryFrame
2588+
ifNil: [ summaryFrame := (self column: column) summary asDataFrame ]
2589+
ifNotNil: [ summaryFrame addColumn: (self column: column) summary ] ] ].
2590+
^ summaryFrame
2591+
]
2592+
2593+
{ #category : #accessing }
25812594
DataFrame >> tail [
25822595
"Returns the last 5 rows of a DataFrame"
25832596

src/DataFrame/DataSeries.class.st

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1057,18 +1057,22 @@ DataSeries >> sum [
10571057

10581058
{ #category : 'statistics' }
10591059
DataSeries >> summary [
1060-
"A data series is returned which is a statistical summary of the data series. With keys as different statistical measures and values as the values returned when those statistical measures are applied on the data series."
1060+
"A data series is returned which is a statistical summary of the data series.
1061+
With keys as different statistical measures and values as the values returned
1062+
when those statistical measures are applied on the data series."
10611063

10621064
| summary |
10631065
summary := self species new.
10641066
summary name: self name.
10651067

10661068
summary
1067-
at: 'Min' put: self min;
1068-
at: '1st Qu.' put: self firstQuartile;
1069-
at: 'Median' put: self median;
1069+
at: 'Count' put: self size;
10701070
at: 'Average' put: self average;
1071-
at: '3rd Qu.' put: self thirdQuartile;
1071+
at: 'Stdev' put: self stdev;
1072+
at: 'Min' put: self min;
1073+
at: '25%' put: self firstQuartile;
1074+
at: '50%' put: self median;
1075+
at: '75%' put: self thirdQuartile;
10721076
at: 'Max' put: self max.
10731077

10741078
^ summary

0 commit comments

Comments
 (0)