Merge pull request #256 from Joshua-Dias-Barreto/chainedSorting

Added DataFrame>> #sortByAll: and #sortDescendingByAll: for chain sorting

Author: jecisc

src/DataFrame-Tests/DataFrameTest.class.st

@@ -5065,6 +5065,37 @@ DataFrameTest >> testSortBy [
 	self assert: actual equals: expected
 ]
 
+{ #category : #tests }
+DataFrameTest >> testSortByAll [
+
+	| dataFrame actual expected |
+	dataFrame := DataFrame withRows:
+		             #( #( 2 5 ) 
+							 #( 1 2 ) 
+							 #( 3 2 ) 
+							 #( 1 5 ) 
+							 #( 2 4 ) ).
+
+	dataFrame columnNames: #( season episode ).
+	dataFrame rowNames: #( 'A' 'B' 'C' 'D' 'E' ).
+
+
+	expected := DataFrame withRows:
+		            #( #( 1 2 ) 
+							#( 1 5 ) 
+							#( 2 4 ) 
+							#( 2 5 ) 
+							#( 3 2 ) ).
+
+	expected columnNames: #( season episode ).
+	expected rowNames: #( 'B' 'D' 'E' 'A' 'C' ).
+
+	actual := dataFrame sortByAll: #( season episode ).
+
+
+	self assert: actual equals: expected
+]
+
 { #category : #tests }
 DataFrameTest >> testSortByUsing [
 	"Sort by second letter of city name"
@@ -5101,6 +5132,37 @@ DataFrameTest >> testSortDescendingBy [
 	self assert: actual equals: expected
 ]
 
+{ #category : #tests }
+DataFrameTest >> testSortDescendingByAll [
+
+	| dataFrame actual expected |
+	dataFrame := DataFrame withRows:
+		             #( #( 2 5 ) 
+							 #( 1 2 ) 
+							 #( 3 2 ) 
+							 #( 1 5 ) 
+							 #( 2 4 ) ).
+
+	dataFrame columnNames: #( season episode ).
+	dataFrame rowNames: #( 'A' 'B' 'C' 'D' 'E' ).
+
+
+	expected := DataFrame withRows:
+		            #( #( 3 2 )
+							#( 2 5 ) 
+							#( 2 4 )
+							#( 1 5 )
+							#( 1 2 ) ).
+
+	expected columnNames: #( season episode ).
+	expected rowNames: #( 'C' 'A' 'E' 'D' 'B' ).
+
+	actual := dataFrame sortDescendingByAll: #( season episode ).
+
+
+	self assert: actual equals: expected
+]
+
 { #category : #tests }
 DataFrameTest >> testToColumnApplyElementwise [
 

src/DataFrame/DataFrame.class.st

@@ -2197,13 +2197,31 @@ DataFrame >> sortBy: columnName using: aBlock [
 	self rowNames: sortedKeys
 ]
 
+{ #category : #sorting }
+DataFrame >> sortByAll: arrayOfColumnNames [
+	" Chain sorts the data frame in ascending order. The data frame is sorted based on the first column in the array of column names, if there are same values, then it sorts these same values based on the values of the second column and so on.."
+
+	arrayOfColumnNames reverseDo: [ :columnName |
+		self sortBy: columnName using: [ :a :b | a <= b ] ].
+	^ self
+]
+
 { #category : #sorting }
 DataFrame >> sortDescendingBy: columnName [
 	"Rearranges the rows of the data frame in descending order of the values in the column named columnName"
 
 	self sortBy: columnName using: [ :a :b | a >= b ]
 ]
 
+{ #category : #sorting }
+DataFrame >> sortDescendingByAll: arrayOfColumnNames [
+	" Chain sorts the data frame in descending order. The data frame is sorted based on the first column in the array of column names, if there are same values, then it sorts these same values based on the values of the second column and so on.."
+
+	arrayOfColumnNames reverseDo: [ :columnName |
+		self sortBy: columnName using: [ :a :b | a >= b ] ].
+	^ self
+]
+
 { #category : #statistics }
 DataFrame >> stdev [
    "Standard deviation is a measure of how dispersed the data is in relation to the average"