Improve management of #closeTo:

src/DataFrame-Tests/DataFrameTest.class.st

@@ -461,6 +461,40 @@ DataFrameTest >> testChangeDataTypes [
 	self assert: df dataTypes equals: newDataTypes
 ]
 
+{ #category : #tests }
+DataFrameTest >> testCloseTo [
+
+	| collection |
+	collection := DataFrame withRows: #( #( Barcelona 1.609 true ) #( Dubai 2.789 true ) #( London 8.788 false ) #( Paris 2.141 true ) ).
+	self assert: (collection closeTo: (DataFrame withRows: #( #( Barcelona 1.609 true ) #( Dubai 2.789 true ) #( London 8.788 false ) #( Paris 2.141 true ) ))).
+
+
+	self assert: (collection closeTo: (DataFrame withRows:
+				  #( #( Barcelona 1.609000000000001 true ) #( Dubai 2.78900000001 true ) #( London 8.788000000001 false ) #( Paris 2.14100000000000005 true ) ))).
+
+	self deny: (collection closeTo: (DataFrame withRows: #( #( Barcelona 1.608 true ) #( Dubai 2.789 true ) #( London 8.788 false ) #( Paris 2.141 true ) )))
+]
+
+{ #category : #tests }
+DataFrameTest >> testCloseToPrecision [
+
+	| collection |
+	collection := DataFrame withRows: #( #( Barcelona 1.609 true ) #( Dubai 2.789 true ) #( London 8.788 false ) #( Paris 2.141 true ) ).
+	self assert: (collection
+			 closeTo: (DataFrame withRows: #( #( Barcelona 1.609 true ) #( Dubai 2.789 true ) #( London 8.788 false ) #( Paris 2.141 true ) ))
+			 precision: 0.0000001).
+
+
+	self assert: (collection
+			 closeTo: (DataFrame withRows:
+					  #( #( Barcelona 1.609000000000001 true ) #( Dubai 2.78900000001 true ) #( London 8.788000000001 false ) #( Paris 2.14100000000000005 true ) ))
+			 precision: 0.0000001).
+
+	self deny: (collection
+			 closeTo: (DataFrame withRows: #( #( Barcelona 1.608 true ) #( Dubai 2.789 true ) #( London 8.788 false ) #( Paris 2.141 true ) ))
+			 precision: 0.0000001)
+]
+
 { #category : #tests }
 DataFrameTest >> testCollect [
 	| expectedDf expectedResult actualResult |

src/DataFrame/DataFrame.class.st

@@ -535,20 +535,39 @@ DataFrame >> calculateDataTypes [
 { #category : #comparing }
 DataFrame >> closeTo: aDataFrame [
 
-	aDataFrame species = self species
-		ifFalse: [ ^ false ].
+	aDataFrame species = self species ifFalse: [ ^ false ].
 
-	aDataFrame dimensions = self dimensions
-		ifFalse: [ ^ false ].
+	aDataFrame dimensions = self dimensions ifFalse: [ ^ false ].
 
-	(aDataFrame rowNames = self rowNames
-		and: [ aDataFrame columnNames = self columnNames ])
-		ifFalse: [ ^ false ].
+	(aDataFrame rowNames = self rowNames and: [ aDataFrame columnNames = self columnNames ]) ifFalse: [ ^ false ].
+
+	1 to: self numberOfRows do: [ :i |
+		1 to: self numberOfColumns do: [ :j |
+			| value |
+			value := self at: i at: j.
+			(value isNumber
+				 ifTrue: [ value closeTo: (aDataFrame at: i at: j) ]
+				 ifFalse: [ value = (aDataFrame at: i at: j) ]) ifFalse: [ ^ false ] ] ].
+
+	^ true
+]
+
+{ #category : #comparing }
+DataFrame >> closeTo: aDataFrame precision: epsilon [
+
+	aDataFrame species = self species ifFalse: [ ^ false ].
+
+	aDataFrame dimensions = self dimensions ifFalse: [ ^ false ].
+
+	(aDataFrame rowNames = self rowNames and: [ aDataFrame columnNames = self columnNames ]) ifFalse: [ ^ false ].
 
 	1 to: self numberOfRows do: [ :i |
 		1 to: self numberOfColumns do: [ :j |
-			((self at: i at: j) closeTo: (aDataFrame at: i at: j))
-				ifFalse: [ ^ false ] ] ].
+			| value |
+			value := self at: i at: j.
+			(value isNumber
+				 ifTrue: [ value closeTo: (aDataFrame at: i at: j) precision: epsilon ]
+				 ifFalse: [ value = (aDataFrame at: i at: j) ]) ifFalse: [ ^ false ] ] ].
 
 	^ true
 ]