Merge pull request #317 from jecisc/use-pharo-constants

Use pharo constants

Author: olekscode

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'

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

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 }
@@ -98,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 }
@@ -121,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 }

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 }

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
 ]
 

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
 ]
 

src/Math-FunctionFit/PMAnotherGeneticOptimizer.class.st

@@ -19,7 +19,8 @@ Class {
 
 { #category : #information }
 PMAnotherGeneticOptimizer class >> defaultPrecision [
-	^PMFloatingPointMachine new machinePrecision
+
+	^ Float machineEpsilon
 ]
 
 { #category : #'instance creation' }

src/Math-FunctionFit/PMGeneralFunctionFit.class.st

@@ -100,11 +100,12 @@ PMGeneralFunctionFit >> evaluate [
 	               ff parameters ] onErrorDo: [
 		               verbose ifTrue: [ self inform: 'ErrorMinimizer was not successful' ].
 		               nil ].
+
 	firstResult ifNotNil: [ geneticOptimizer addPointAt: firstResult ].
 	firstResult := geneticOptimizer evaluate.
 	self errorType = #squared ifTrue: [ ff := PMFunctionFit function: errorFunction function data: errorFunction data ].
 	ff parameters: firstResult.
-	ff desiredPrecision: PMFloatingPointMachine new machinePrecision.
+	ff desiredPrecision: Float machineEpsilon.
 	ff maximumIterations: 1000.
 	result := [
 	          ff evaluate.

src/Math-Helpers/PMFloatingPointMachine.class.st

@@ -62,16 +62,6 @@ Number >> logGamma [
 					]
 ]
 
-{ #category : #'*Math-Numerical' }
-Number >> relativelyEqualsTo: aNumber upTo: aSmallNumber [
-		"compare to Float>>closeTo:
-		generally called from Number>>equalsTo:"
-	| norm |
-	norm := self abs max: aNumber abs.
-	^norm <= PMFloatingPointMachine new defaultNumericalPrecision
-		or: [ (self - aNumber) abs < ( aSmallNumber * norm)]
-]
-
 { #category : #'*Math-Numerical' }
 Number >> subtractToPolynomial: aPolynomial [
 	^aPolynomial addNumber: self negated