Merge pull request #218 from SergeStinckwich/feature/fix-failed-tests-for-Pharo9

Feature/fix failed tests for pharo9

Author: SergeStinckwich

.github/workflows/smalltalk-ci.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         os: [ macos-latest, windows-latest, ubuntu-latest]
-        smalltalk: [Pharo64-8.0]
+        smalltalk: [ Pharo64-8.0, Pharo64-9.0]
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.smalltalk }} on ${{ matrix.os }}
     steps:

src/Math-Tests-FunctionFit/PMAnotherGeneticOptimizerTest.class.st

@@ -8,13 +8,20 @@ Class {
 }
 
 { #category : #running }
-PMAnotherGeneticOptimizerTest >> setUp [ 
-|origin f|
-f:=[:x| |v| v:=x asPMVector . v*v].
-origin:= #(-5 -5 -5).
-go:= PMAnotherGeneticOptimizer function: f minimumValues: origin maximumValues: origin negated .
-go maximumIterations: 50.
-go chromosomeManager populationSize: 20.
+PMAnotherGeneticOptimizerTest >> setUp [
+
+	| origin f |
+	f := [ :x | 
+	     | v |
+	     v := x asPMVector.
+	     v * v ].
+	origin := #( -5 -5 -5 ).
+	go := PMAnotherGeneticOptimizer
+		      function: f
+		      minimumValues: origin
+		      maximumValues: origin negated.
+	go maximumIterations: 50.
+	go chromosomeManager populationSize: 20
 ]
 
 { #category : #tests }
@@ -62,13 +69,14 @@ self assert: (go bestValueHistory isEmpty  ).
 
 { #category : #tests }
 PMAnotherGeneticOptimizerTest >> testPrint [
-|aStream  s|
-aStream :=ReadWriteStream with:''.
-go printOn: aStream .
-s :=aStream contents .
-self assert: (s includesSubstring: 'v * v').
-self assert: (s includesSubstring: '50').
-self assert: (s includesSubstring: '20').
+
+	| aStream s |
+	aStream := ReadWriteStream with: ''.
+	go printOn: aStream.
+	s := aStream contents.
+	self assert: (s includesSubstring: 'v * v').
+	self assert: (s includesSubstring: '50').
+	self assert: (s includesSubstring: '20')
 ]
 
 { #category : #tests }

src/Math-Tests-FunctionFit/PMErrorAsParameterFunctionTest.class.st

@@ -8,12 +8,15 @@ Class {
 }
 
 { #category : #running }
-PMErrorAsParameterFunctionTest >> setUp [ 
-|col|
-f:=PMErrorOfParameterFunction new function: [:x :a :b|a*x / (b+x)].
-col:=(1 to: 3)collect: [:i|i@(f function cull: i cull: 1 cull: 1) ].
-f data: col.
-f :=PMErrorAsParameterFunction new function: f.
+PMErrorAsParameterFunctionTest >> setUp [
+
+	| col |
+	f := PMErrorOfParameterFunction new function: [ :x :a :b | 
+		     a * x / (b + x) ].
+	col := (1 to: 3) collect: [ :i | 
+		       i @ (f function cull: i cull: 1 cull: 1) ].
+	f data: col.
+	f := PMErrorAsParameterFunction new function: f
 ]
 
 { #category : #tests }
@@ -24,15 +27,15 @@ self assert: (f parameters size < f maxFunction ).
 
 { #category : #tests }
 PMErrorAsParameterFunctionTest >> testPrint [
-|aStream  s|
-aStream :=ReadWriteStream with:''.
-f printOn: aStream .
-s :=aStream contents .
-self assert: (s includesSubstring: 'a * x / (b + x)').
-self assert: (s includesSubstring: '#squared').
-self assert: (s includesSubstring: 'maxFunction: ', f maxFunction asString).
-
 
+	| aStream s |
+	aStream := ReadWriteStream with: ''.
+	f printOn: aStream.
+	s := aStream contents.
+	self assert: (s includesSubstring: 'a * x / (b + x)').
+	self assert: (s includesSubstring: '#squared').
+	self assert:
+		(s includesSubstring: 'maxFunction: ' , f maxFunction asString)
 ]
 
 { #category : #tests }

src/Math-Tests-FunctionFit/PMErrorOfParameterFunctionTest.class.st

@@ -10,9 +10,11 @@ Class {
 
 { #category : #running }
 PMErrorOfParameterFunctionTest >> setUp [
-f:=PMErrorOfParameterFunction new function: [:x :a :b|a*x / (b+x)].
-col:=(1 to: 3)collect: [:i|i@(f function cull: i cull: 1 cull: 1) ].
 
+	f := PMErrorOfParameterFunction new function: [ :x :a :b | 
+		     a * x / (b + x) ].
+	col := (1 to: 3) collect: [ :i | 
+		       i @ (f function cull: i cull: 1 cull: 1) ]
 ]
 
 { #category : #tests }

src/Math-Tests-FunctionFit/PMFunctionFitTest.class.st

@@ -9,9 +9,10 @@ Class {
 }
 
 { #category : #running }
-PMFunctionFitTest >> setUp [ 
-f:=[:x :a :b|a*x / (b+x)].
-d:=(1 to: 20)collect: [:i|i@(f cull: i cull: 2 cull: 0.4) ].
+PMFunctionFitTest >> setUp [
+
+	f := [ :x :a :b | a * x / (b + x) ].
+	d := (1 to: 20) collect: [ :i | i @ (f cull: i cull: 2 cull: 0.4) ]
 ]
 
 { #category : #tests }

src/Math-Tests-KDTree/PMKDTreeTest.class.st

@@ -52,7 +52,7 @@ PMKDTreeTest >> testIndexedKDTree1Dimension [
 		aResult := stupid nnSearch: aVector i: 3.			"3 nearest numbers to aVector "
 		bResult := m atAll: ((tree nnSearch: aVector i: 3) collect: [:a | a first]).	
 		self equalityTest: aResult and: bResult].
-	]
+]
 
 { #category : #tests }
 PMKDTreeTest >> testIndexedKDTree4Dimensions [
@@ -99,7 +99,7 @@ PMKDTreeTest >> testKDTree1Dimension [
 		aResult := stupid nnSearch: aVector i: 3.				"3 nearest numbers to aVector "
 		bResult := tree nnSearch: aVector i: 3.							
 		self equalityTest: aResult and: bResult].
-	]
+]
 
 { #category : #tests }
 PMKDTreeTest >> testKDTree1DimensionIntegers [
@@ -110,7 +110,7 @@ PMKDTreeTest >> testKDTree1DimensionIntegers [
 		aResult :=(aVector first - (stupid nnSearch: aVector i: 3)) abs.		"distances between 3 nearest numbers and aVector "
 		bResult :=(aVector first - (tree nnSearch: aVector i: 3)) abs.		"distances using KDTree"
 		self equalityTest: aResult and: bResult ]  .
-	]
+]
 
 { #category : #tests }
 PMKDTreeTest >> testKDTree2Dimensions [

src/Math-Tests-KDTree/PMNNStoreTest.class.st

@@ -175,16 +175,21 @@ PMNNStoreTest >> testNewFrom [
 
 { #category : #tests }
 PMNNStoreTest >> testWithAll [
-	| n |
-	n := PMNNStore withAll: #(2 5 4).
-	self assert: n completeData equals: #(#(nil 2) #(nil 5) #(nil 4)).
-	n sortFor: nil.	"calling sortFor: is necessary with withAll:"
-	self assert: n data equals: #(2 4 5).
+
+	| n array |
+	n := PMNNStore withAll: #( 2 5 4 ).
+	self
+		assert: n completeData
+		equals: #( #( nil 2 ) #( nil 5 ) #( nil 4 ) ).
+	n sortFor: nil. "calling sortFor: is necessary with withAll:"
+	self assert: n data equals: #( 2 4 5 ).
 	self assert: n isFull.
-	n add: #(3 6).	"one has to be a bit carefull when one uses 
-				 NNStore withAll:, as sortfor: changes this data. 
+	n add: #(3 6) copy. 
+	
+	"one has to be a bit carefull when one uses 
+				 PMNNStore withAll:, as sortfor: changes this data. 
 				 n add: #(3 6) is not possible here!"
-	self assert: n data equals: #(2 6 4).
+	self assert: n data equals: #( 2 6 4 ).
 	n sortFor: nil.
-	self assert: n data equals: #(2 4 6)
+	self assert: n data equals: #( 2 4 6 )
 ]