PolyMathOrg · olekscode · Mar 14, 2023 · Mar 10, 2023 · Mar 10, 2023 · Mar 10, 2023
diff --git a/src/BaselineOfPolyMath/BaselineOfPolyMath.class.st b/src/BaselineOfPolyMath/BaselineOfPolyMath.class.st
@@ -39,12 +39,12 @@ BaselineOfPolyMath >> baseline: spec [
 			package: 'Math-Complex' with: [ spec requires: #( 'Math-Numerical' 'Math-Polynomials' ) ];
 			package: 'Math-Helpers';
 			package: 'Math-Distributions' with: [ spec requires: #( 'MathVectorMatrix' 'Math-Quantile' 'Math-Core-Process' ) ];
-			package: 'Math-Core-Process' with: [ spec requires: #( 'Math-Helpers' ) ];
+			package: 'Math-Core-Process';
 			package: 'Math-Numerical'
-			with: [ spec requires: #( 'MathVectorMatrix' 'Math-Helpers' 'Math-Core-Process' 'Math-Distributions' 'Math-StatisticalMoments'
+			with: [ spec requires: #( 'MathVectorMatrix' 'Math-Core-Process' 'Math-Distributions' 'Math-StatisticalMoments'
 					   'Math-Series' ) ];
 			package: 'Math-Polynomials'
-			with: [ spec requires: #( 'MathVectorMatrix' 'Math-Helpers' 'Math-Core-Process' 'Math-Distributions' 'Math-StatisticalMoments'
+			with: [ spec requires: #( 'MathVectorMatrix' 'Math-Core-Process' 'Math-Distributions' 'Math-StatisticalMoments'
 					   'Math-Series' ) ];
 			package: 'Math-FastFourierTransform' with: [ spec requires: #( 'Math-Complex' ) ];
 			package: 'Math-FunctionFit'

diff --git a/src/Math-CompatibilityUpToPharo11/Float.extension.st b/src/Math-CompatibilityUpToPharo11/Float.extension.st
@@ -1,5 +1,11 @@
 Extension { #name : #Float }
 
+{ #category : #'*Math-CompatibilityUpToPharo11' }
+Float class >> defaultComparisonPrecision [
+
+	^ self machineEpsilon sqrt
+]
+
 { #category : #'*Math-CompatibilityUpToPharo11' }
 Float class >> machineEpsilon [
 	"Answer the machine epsilon or macheps, defined by wikipedia asCalypsoItemContext

diff --git a/src/Math-Core-Process/PMIterativeProcess.class.st b/src/Math-Core-Process/PMIterativeProcess.class.st
@@ -33,7 +33,9 @@ PMIterativeProcess class >> defaultMaximumIterations [
 { #category : #default }
 PMIterativeProcess class >> defaultPrecision [
 	"Private - Answers the default precision for newly created instances."
-	^PMFloatingPointMachine new defaultNumericalPrecision
+
+	self flag: #todo. "In Pharo 12 the default comparision precision of Float will be improved. When Pharo 12 will be the minimal version of Polymath we can use `Float defaultComparisonPrecision"
+	^ Float machineEpsilon sqrt
 ]
 
 { #category : #initialization }
@@ -82,8 +84,7 @@ PMIterativeProcess >> initialize [
 	super initialize.
 
 	desiredPrecision := self class defaultPrecision.
-	maximumIterations := self class defaultMaximumIterations.
-	^ self
+	maximumIterations := self class defaultMaximumIterations
 ]
 
 { #category : #operation }
@@ -99,10 +100,13 @@ PMIterativeProcess >> iterations [
 
 { #category : #private }
 PMIterativeProcess >> limitedSmallValue: aNumber [
-	"Private - prevent aNumber from being smaller in absolute value than a small number."
-	^aNumber abs < PMFloatingPointMachine new smallNumber
-			ifTrue: [ PMFloatingPointMachine new smallNumber]
-			ifFalse:[ aNumber]
+	"Private - prevent aNumber from being smaller in absolute value than a small."
+
+	| smallestAccepted |
+	smallestAccepted := Float fmin sqrt.
+	^ aNumber abs < smallestAccepted
+		  ifTrue: [ smallestAccepted ]
+		  ifFalse: [ aNumber ]
 ]
 
 { #category : #initialization }
@@ -122,9 +126,9 @@ PMIterativeProcess >> precision [
 { #category : #information }
 PMIterativeProcess >> precisionOf: aNumber1 relativeTo: aNumber2 [
 
-	^aNumber2 > PMFloatingPointMachine new defaultNumericalPrecision
-		ifTrue: [ aNumber1 / aNumber2]
-		ifFalse:[ aNumber1]
+	^ aNumber2 > Float defaultComparisonPrecision
+		  ifTrue: [ aNumber1 / aNumber2 ]
+		  ifFalse: [ aNumber1 ]
 ]
 
 { #category : #information }

diff --git a/src/Math-Distributions/PMFisherTippettDistribution.class.st b/src/Math-Distributions/PMFisherTippettDistribution.class.st
@@ -60,7 +60,7 @@ PMFisherTippettDistribution >> distributionValue: aNumber [
 		 the receiver with a value lower than or equal to aNumber."
 	| arg |
 	arg := ( aNumber - alpha) / beta.
-	arg := arg < PMFloatingPointMachine new largestExponentArgument negated
+	arg := arg < Float fmax ln negated
 					ifTrue: [ ^0]
 					ifFalse:[arg negated exp].
 	^arg negated exp
@@ -126,14 +126,17 @@ PMFisherTippettDistribution >> standardDeviation [
 
 { #category : #information }
 PMFisherTippettDistribution >> value: aNumber [
-		"Answers the probability that a random variable distributed according to the receiver
+	"Answers the probability that a random variable distributed according to the receiver
 		 gives a value between aNumber and aNumber + espilon (infinitesimal interval)."
+
 	| arg |
-	arg := ( aNumber - alpha) / beta.
-	arg := arg > PMFloatingPointMachine new largestExponentArgument ifTrue: [ ^0]
-						ifFalse:[arg negated exp + arg].
-	^arg > PMFloatingPointMachine new largestExponentArgument ifTrue: [ 0]
-						ifFalse:[ arg negated exp / beta]
+	arg := aNumber - alpha / beta.
+	arg := arg > Float fmax ln
+		       ifTrue: [ ^ 0 ]
+		       ifFalse: [ arg negated exp + arg ].
+	^ arg > Float fmax ln
+		  ifTrue: [ 0 ]
+		  ifFalse: [ arg negated exp / beta ]
 ]
 
 { #category : #information }

diff --git a/src/Math-Distributions/PMIncompleteBetaFunction.class.st b/src/Math-Distributions/PMIncompleteBetaFunction.class.st
@@ -26,7 +26,7 @@ PMIncompleteBetaFunction >> evaluateFraction: aNumber [
 		fraction setParameter: alpha1 second: alpha2 ].
 	fraction setArgument: aNumber.
 	^ (PMContinuedFraction server: fraction)
-		  desiredPrecision: PMFloatingPointMachine new defaultNumericalPrecision;
+		  desiredPrecision: Float defaultComparisonPrecision;
 		  evaluate
 ]
 
@@ -38,7 +38,7 @@ PMIncompleteBetaFunction >> evaluateInverseFraction: aNumber [
 		inverseFraction setParameter: alpha2 second: alpha1 ].
 	inverseFraction setArgument: 1 - aNumber.
 	^ (PMContinuedFraction server: inverseFraction)
-		  desiredPrecision: PMFloatingPointMachine new defaultNumericalPrecision;
+		  desiredPrecision: Float defaultComparisonPrecision;
 		  evaluate
 ]
 

diff --git a/src/Math-Distributions/PMIncompleteGammaFunction.class.st b/src/Math-Distributions/PMIncompleteGammaFunction.class.st
@@ -24,7 +24,7 @@ PMIncompleteGammaFunction >> evaluateFraction: aNumber [
 		fraction setParameter: alpha ].
 	fraction setArgument: aNumber.
 	^ (PMContinuedFraction server: fraction)
-		  desiredPrecision: PMFloatingPointMachine new defaultNumericalPrecision;
+		  desiredPrecision: Float defaultComparisonPrecision;
 		  evaluate
 ]
 
@@ -36,7 +36,7 @@ PMIncompleteGammaFunction >> evaluateSeries: aNumber [
 		series setParameter: alpha ].
 	series setArgument: aNumber.
 	^ (PMInfiniteSeries server: series)
-		  desiredPrecision: PMFloatingPointMachine new defaultNumericalPrecision;
+		  desiredPrecision: Float defaultComparisonPrecision;
 		  evaluate
 ]
 

diff --git a/src/Math-FunctionFit/PMAnotherChromosomeManager.class.st b/src/Math-FunctionFit/PMAnotherChromosomeManager.class.st
@@ -8,7 +8,8 @@ Class {
 	#instVars : [
 		'hammersley',
 		'rateOfLC',
-		'rateOfEir'
+		'rateOfEir',
+		'randomGenerator'
 	],
 	#classVars : [
 		'Primes'
@@ -33,28 +34,29 @@ PMAnotherChromosomeManager class >> integerDigitsFor: anInteger base: aBase [
 ]
 
 { #category : #utilities }
-PMAnotherChromosomeManager class >> numberOfHamersleyPoints: n dimension: d randomized: aBoolean [
+PMAnotherChromosomeManager class >> numberOfHamersleyPoints: n dimension: d randomGenerator: randomGenerator [
 	"a bit randomized "
-	| dist randomNumberGenerator |
+
+	| dist |
 	dist := 1.0 / n.
-	randomNumberGenerator := Random new.
-
-	^(1 to: n) collect: [ :number |
-		(1 to: d) collect: [ :dim |
-			(dim=1)
-				ifTrue: [ aBoolean
-					ifTrue: [ (number/n) - (randomNumberGenerator nextBetween: 0 and: dist) ]
-					ifFalse: [ number/n ] ]
-				ifFalse: [ |sum prime|
-					sum := 0.
-					prime := Primes at: dim - 1.
-
-					(self integerDigitsFor: number base: prime) reverse withIndexDo: [ :i :index |
-						sum := i / (prime raisedToInteger: index) + sum ].
-
-					aBoolean
-						ifTrue: [ sum + (randomNumberGenerator nextBetween: 0 and: dist) ]
-						ifFalse: [ sum ] ] ]].
+
+	^ (1 to: n) collect: [ :number |
+		  (1 to: d) collect: [ :dim |
+			  dim = 1
+				  ifTrue: [
+					  randomGenerator
+						  ifNotNil: [ number / n - (randomGenerator nextBetween: 0 and: dist) ]
+						  ifNil: [ number / n ] ]
+				  ifFalse: [
+					  | sum prime |
+					  sum := 0.
+					  prime := Primes at: dim - 1.
+
+					  (self integerDigitsFor: number base: prime) reverse withIndexDo: [ :i :index | sum := i / (prime raisedToInteger: index) + sum ].
+
+					  randomGenerator
+						  ifNotNil: [ sum + (randomGenerator nextBetween: 0 and: dist) ]
+						  ifNil: [ sum ] ] ] ]
 ]
 
 { #category : #'instance creation' }
@@ -108,14 +110,15 @@ PMAnotherChromosomeManager >> eirCrossover: aChromosome1 and: aChromosome2 [
 
 { #category : #initialization }
 PMAnotherChromosomeManager >> initialize [
-super initialize .
-populationSize :=100.
-hammersley :=true.
-rateOfEir :=0.16.
-rateOfLC:=0.29.
-rateOfMutation :=0.4.
-rateOfCrossover :=0.15.
-Primes  ifNil:[Primes :=Integer primesUpTo: 500].	"sufficient for up to 95 dimensions (parameters)"
+
+	super initialize.
+	populationSize := 100.
+	hammersley := true.
+	rateOfEir := 0.16.
+	rateOfLC := 0.29.
+	rateOfMutation := 0.4.
+	rateOfCrossover := 0.15.
+	Primes ifNil: [ Primes := Integer primesUpTo: 500 ] "sufficient for up to 95 dimensions (parameters)"
 ]
 
 { #category : #information }
@@ -205,16 +208,29 @@ PMAnotherChromosomeManager >> process: aChromosome1 and: aChromosome2 [
 								add: (self clone: aChromosome2)]]]]
 ]
 
+{ #category : #accessing }
+PMAnotherChromosomeManager >> randomGenerator [
+
+	^ randomGenerator
+]
+
+{ #category : #accessing }
+PMAnotherChromosomeManager >> randomGenerator: anObject [
+
+	randomGenerator := anObject
+]
+
 { #category : #private }
 PMAnotherChromosomeManager >> randomRangeAt: aPosition [
 ^(range at: aPosition )*(self smallDistribution )
 ]
 
 { #category : #operation }
 PMAnotherChromosomeManager >> randomizePopulation [
-hammersley ifFalse: [^super randomizePopulation ].
-population :=self class numberOfHamersleyPoints: populationSize  dimension: origin size randomized: true.
-population := population collect: [:aChr| aChr *range +origin ]
+
+	hammersley ifFalse: [ ^ super randomizePopulation ].
+	population := self class numberOfHamersleyPoints: populationSize dimension: origin size randomGenerator: (self randomGenerator ifNil: [ Random new ]).
+	population := population collect: [ :aChr | aChr * range + origin ]
 ]
 
 { #category : #accessing }

diff --git a/src/Math-FunctionFit/PMAnotherGeneticOptimizer.class.st b/src/Math-FunctionFit/PMAnotherGeneticOptimizer.class.st
@@ -19,7 +19,8 @@ Class {
 
 { #category : #information }
 PMAnotherGeneticOptimizer class >> defaultPrecision [
-	^PMFloatingPointMachine new machinePrecision
+
+	^ Float machineEpsilon
 ]
 
 { #category : #'instance creation' }
@@ -95,7 +96,8 @@ PMAnotherGeneticOptimizer >> computePrecision: whateverData [  "can be changed t
 
 { #category : #operation }
 PMAnotherGeneticOptimizer >> evaluate [
-^Cursor wait showWhile: [super evaluate]
+
+	^ Cursor wait showWhile: [ super evaluate ]
 ]
 
 { #category : #operation }
@@ -129,12 +131,12 @@ statistics :=false
 
 { #category : #operation }
 PMAnotherGeneticOptimizer >> initializeIterations [
-	bestPoints size>=chromosomeManager populationSize
-		ifTrue: [bestPoints := bestPoints copyFrom: 1 to: (bestPoints size // 2 max: 1)].
+
+	bestPoints size >= chromosomeManager populationSize ifTrue: [ bestPoints := bestPoints copyFrom: 1 to: (bestPoints size // 2 max: 1) ].
 	super initializeIterations.
-	bestValueHistory:=OrderedCollection new.
-	worstValueHistory:=OrderedCollection new.
-	whateverHistory:=OrderedCollection new
+	bestValueHistory := OrderedCollection new.
+	worstValueHistory := OrderedCollection new.
+	whateverHistory := OrderedCollection new
 ]
 
 { #category : #operation }

diff --git a/src/Math-FunctionFit/PMErrorMinimizer.class.st b/src/Math-FunctionFit/PMErrorMinimizer.class.st
@@ -29,6 +29,7 @@ PMErrorMinimizer class >> function: aBlock data: aCollection [
 
 { #category : #accessing }
 PMErrorMinimizer >> maxFunction [
-"The number of data partitions used."
-^dataHolder size
+	"The number of data partitions used."
+
+	^ dataHolder size
 ]
diff --git a/src/Math-FunctionFit/PMFunctionFit.class.st b/src/Math-FunctionFit/PMFunctionFit.class.st
@@ -43,7 +43,12 @@ PMFunctionFit >> accumulate: aWeightedPoint [
 
 { #category : #operation }
 PMFunctionFit >> computeChanges [
-	^[super computeChanges]on: PMSingularMatrixError  do:[:signal|signal messageText: 'singular error matrix, set better parameters'.signal pass]
+
+	^ [ super computeChanges ]
+		  on: PMSingularMatrixError
+		  do: [ :signal |
+			  signal messageText: 'singular error matrix, set better parameters'.
+			  signal pass ]
 ]
 
 { #category : #information }