Move distributions from Numerical to Distributions

jecisc · jecisc · commit 39a3c1d119f4 · 2023-02-23T21:36:02.000+01:00
diff --git a/src/Math-Distributions/PMCauchyDistribution.class.st b/src/Math-Distributions/PMCauchyDistribution.class.st
@@ -8,7 +8,7 @@ Class {
 		'mu',
 		'beta'
 	],
-	#category : #'Math-Numerical-Math-Distribution'
+	#category : #'Math-Distributions'
 }
 
 { #category : #information }
diff --git a/src/Math-Distributions/PMExponentialDistribution.class.st b/src/Math-Distributions/PMExponentialDistribution.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'beta'
 	],
-	#category : #'Math-Numerical-Math-Distribution'
+	#category : #'Math-Distributions'
 }
 
 { #category : #information }
diff --git a/src/Math-Distributions/PMFisherTippettDistribution.class.st b/src/Math-Distributions/PMFisherTippettDistribution.class.st
@@ -5,7 +5,7 @@ Class {
 		'alpha',
 		'beta'
 	],
-	#category : #'Math-Numerical-Math-Distribution'
+	#category : #'Math-Distributions'
 }
 
 { #category : #information }
diff --git a/src/Math-Distributions/PMHistogrammedDistribution.class.st b/src/Math-Distributions/PMHistogrammedDistribution.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'histogram'
 	],
-	#category : #'Math-Numerical'
+	#category : #'Math-Distributions'
 }
 
 { #category : #information }
diff --git a/src/Math-Distributions/PMIncompleteBetaFractionTermServer.class.st b/src/Math-Distributions/PMIncompleteBetaFractionTermServer.class.st
@@ -5,7 +5,7 @@ Class {
 		'alpha1',
 		'alpha2'
 	],
-	#category : #'Math-Numerical'
+	#category : #'Math-Distributions-Beta'
 }
 
 { #category : #information }
diff --git a/src/Math-Distributions/PMIncompleteGammaFractionTermServer.class.st b/src/Math-Distributions/PMIncompleteGammaFractionTermServer.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'alpha'
 	],
-	#category : #'Math-Numerical'
+	#category : #'Math-Distributions-Gamma'
 }
 
 { #category : #information }
diff --git a/src/Math-Distributions/PMIncompleteGammaSeriesTermServer.class.st b/src/Math-Distributions/PMIncompleteGammaSeriesTermServer.class.st
@@ -5,7 +5,7 @@ Class {
 		'alpha',
 		'sum'
 	],
-	#category : #'Math-Numerical'
+	#category : #'Math-Distributions-Gamma'
 }
 
 { #category : #information }
diff --git a/src/Math-Distributions/PMLaplaceDistribution.class.st b/src/Math-Distributions/PMLaplaceDistribution.class.st
@@ -5,7 +5,7 @@ Class {
 		'mu',
 		'beta'
 	],
-	#category : #'Math-Numerical-Math-Distribution'
+	#category : #'Math-Distributions'
 }
 
 { #category : #information }
diff --git a/src/Math-Distributions/PMLaplaceGenerator.class.st b/src/Math-Distributions/PMLaplaceGenerator.class.st
@@ -11,7 +11,7 @@ Class {
 		'laplaceDistribution',
 		'next'
 	],
-	#category : #'Math-Numerical'
+	#category : #'Math-Distributions'
 }
 
 { #category : #testing }
diff --git a/src/Math-Distributions/PMLogNormalDistribution.class.st b/src/Math-Distributions/PMLogNormalDistribution.class.st
@@ -1,10 +1,10 @@
 Class {
 	#name : #PMLogNormalDistribution,
-	#superclass : #PMProbabilityDensityWithUnknownDistribution,
+	#superclass : #PMProbabilityDensity,
 	#instVars : [
 		'normalDistribution'
 	],
-	#category : #'Math-Numerical'
+	#category : #'Math-Distributions-Normal'
 }
 
 { #category : #information }
@@ -42,6 +42,13 @@ PMLogNormalDistribution class >> new: aNumber1 sigma: aNumber2 [
 	^super new initialize: aNumber1 sigma: aNumber2
 ]
 
+{ #category : #information }
+PMLogNormalDistribution >> acceptanceBetween: aNumber1 and: aNumber2 [
+		"Answers the probability of observing a random variable distributed according to
+		 the receiver with a value larger than aNumber 1 and lower than or equal to aNumber2."
+	^( PMRombergIntegrator function: [:x| self value:x] from: aNumber1 to: aNumber2) evaluate
+]
+
 { #category : #information }
 PMLogNormalDistribution >> average [
 		"Answer the average of the receiver."
@@ -54,6 +61,14 @@ PMLogNormalDistribution >> changeParametersBy: aVector [
 	normalDistribution changeParametersBy: aVector.
 ]
 
+{ #category : #information }
+PMLogNormalDistribution >> distributionValue: aNumber [
+		"Answers the probability of observing a random variable distributed according to
+		 the receiver with a value lower than or equal to aNumber.
+		 This general purpose routine uses numerical integration."
+	^( PMRombergIntegrator function: [:x| self value:x] from: self lowestValue to: aNumber) evaluate
+]
+
 { #category : #information }
 PMLogNormalDistribution >> fourthCentralMoment [
 		"Private"
@@ -79,6 +94,11 @@ PMLogNormalDistribution >> kurtosis [
 	^( ( x + 2) * x + 3) * ( x squared) - 6
 ]
 
+{ #category : #information }
+PMLogNormalDistribution >> lowestValue [
+	^0
+]
+
 { #category : #information }
 PMLogNormalDistribution >> parameters [
 	^normalDistribution parameters
diff --git a/src/Math-Distributions/PMProbabilityDistributionFunction.class.st b/src/Math-Distributions/PMProbabilityDistributionFunction.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'probabilityDensity'
 	],
-	#category : #'Math-Numerical'
+	#category : #'Math-Distributions'
 }
 
 { #category : #creation }
diff --git a/src/Math-Distributions/PMRombergIntegrator.class.st b/src/Math-Distributions/PMRombergIntegrator.class.st
@@ -21,7 +21,7 @@ Class {
 		'points',
 		'interpolator'
 	],
-	#category : #'Math-Numerical'
+	#category : #'Math-Distributions-Core'
 }
 
 { #category : #information }
diff --git a/src/Math-Distributions/PMSeriesTermServer.class.st b/src/Math-Distributions/PMSeriesTermServer.class.st
@@ -5,7 +5,7 @@ Class {
 		'x',
 		'lastTerm'
 	],
-	#category : #'Math-Numerical'
+	#category : #'Math-Distributions-Gamma'
 }
 
 { #category : #initialization }
diff --git a/src/Math-Distributions/PMSimpsonIntegrator.class.st b/src/Math-Distributions/PMSimpsonIntegrator.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #PMSimpsonIntegrator,
 	#superclass : #PMTrapezeIntegrator,
-	#category : #'Math-Numerical'
+	#category : #'Math-Distributions-Core'
 }
 
 { #category : #operation }
diff --git a/src/Math-Distributions/PMTrapezeIntegrator.class.st b/src/Math-Distributions/PMTrapezeIntegrator.class.st
@@ -12,7 +12,7 @@ Class {
 		'sum',
 		'step'
 	],
-	#category : #'Math-Numerical'
+	#category : #'Math-Distributions-Core'
 }
 
 { #category : #information }
diff --git a/src/Math-Distributions/PMTriangularDistribution.class.st b/src/Math-Distributions/PMTriangularDistribution.class.st
@@ -6,7 +6,7 @@ Class {
 		'highLimit',
 		'peak'
 	],
-	#category : #'Math-Numerical'
+	#category : #'Math-Distributions'
 }
 
 { #category : #information }
diff --git a/src/Math-Distributions/PMUniformDistribution.class.st b/src/Math-Distributions/PMUniformDistribution.class.st
@@ -5,7 +5,7 @@ Class {
 		'lowLimit',
 		'highLimit'
 	],
-	#category : #'Math-Numerical'
+	#category : #'Math-Distributions'
 }
 
 { #category : #public }
diff --git a/src/Math-Distributions/PMWeibullDistribution.class.st b/src/Math-Distributions/PMWeibullDistribution.class.st
@@ -6,7 +6,7 @@ Class {
 		'beta',
 		'norm'
 	],
-	#category : #'Math-Numerical'
+	#category : #'Math-Distributions'
 }
 
 { #category : #information }
diff --git a/src/Math-Numerical/PMIncompleteBetaFunctionFraction.class.st b/src/Math-Numerical/PMIncompleteBetaFunctionFraction.class.st
diff --git a/src/Math-Numerical/PMProbabilityDensityWithUnknownDistribution.class.st b/src/Math-Numerical/PMProbabilityDensityWithUnknownDistribution.class.st
diff --git a/src/Math-Tests-Distributions/PMStatisticsBugs.class.st b/src/Math-Tests-Distributions/PMStatisticsBugs.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #PMStatisticsBugs,
 	#superclass : #TestCase,
-	#category : #'Math-Tests-Numerical'
+	#category : #'Math-Tests-Distributions'
 }
 
 { #category : #tests }
@@ -45,6 +45,18 @@ PMStatisticsBugs >> testFisherTippet2 [
 	self assert: (d distributionValue: -3) equals: -1 exp
 ]
 
+{ #category : #tests }
+PMStatisticsBugs >> testGammaDistribution [
+	| dist |
+	dist := PMGammaDistribution shape: 3.4 scale: 1.7.
+	self assert: (dist average - (3.4 * 1.7)) abs < 0.000000001.
+	self
+		assert: (dist standardDeviation - (3.4 sqrt * 1.7)) abs < 0.000000001.
+	self assert: ((dist value: 4.5) - 0.1446067652) abs < 0.000000001.
+	self
+		assert: ((dist distributionValue: 4.5) - 0.3982869736) abs < 0.000000001
+]
+
 { #category : #tests }
 PMStatisticsBugs >> testProbabilityDensity [
 
diff --git a/src/Math-Tests-Numerical/PMNumericalMethodsTestCase.class.st b/src/Math-Tests-Numerical/PMNumericalMethodsTestCase.class.st
@@ -124,18 +124,6 @@ PMNumericalMethodsTestCase >> testFTest [
 	self assert: (confidenceLevel - 79.8147614536) abs < 0.000000001
 ]
 
-{ #category : #statistics }
-PMNumericalMethodsTestCase >> testGammaDistribution [
-	| dist |
-	dist := PMGammaDistribution shape: 3.4 scale: 1.7.
-	self assert: (dist average - (3.4 * 1.7)) abs < 0.000000001.
-	self
-		assert: (dist standardDeviation - (3.4 sqrt * 1.7)) abs < 0.000000001.
-	self assert: ((dist value: 4.5) - 0.1446067652) abs < 0.000000001.
-	self
-		assert: ((dist distributionValue: 4.5) - 0.3982869736) abs < 0.000000001
-]
-
 { #category : #statistics }
 PMNumericalMethodsTestCase >> testHistogram [
 	| histogram |

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ Class {`
`8`	`8`	`'mu',`
`9`	`9`	`'beta'`
`10`	`10`	`],`
`11`		`- #category : #'Math-Numerical-Math-Distribution'`
	`11`	`+ #category : #'Math-Distributions'`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`{ #category : #information }`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ Class {`
`4`	`4`	`#instVars : [`
`5`	`5`	`'beta'`
`6`	`6`	`],`
`7`		`- #category : #'Math-Numerical-Math-Distribution'`
	`7`	`+ #category : #'Math-Distributions'`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`{ #category : #information }`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ Class {`
`5`	`5`	`'alpha',`
`6`	`6`	`'beta'`
`7`	`7`	`],`
`8`		`- #category : #'Math-Numerical-Math-Distribution'`
	`8`	`+ #category : #'Math-Distributions'`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`{ #category : #information }`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ Class {`
`4`	`4`	`#instVars : [`
`5`	`5`	`'histogram'`
`6`	`6`	`],`
`7`		`- #category : #'Math-Numerical'`
	`7`	`+ #category : #'Math-Distributions'`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`{ #category : #information }`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ Class {`
`5`	`5`	`'alpha1',`
`6`	`6`	`'alpha2'`
`7`	`7`	`],`
`8`		`- #category : #'Math-Numerical'`
	`8`	`+ #category : #'Math-Distributions-Beta'`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`{ #category : #information }`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ Class {`
`4`	`4`	`#instVars : [`
`5`	`5`	`'alpha'`
`6`	`6`	`],`
`7`		`- #category : #'Math-Numerical'`
	`7`	`+ #category : #'Math-Distributions-Gamma'`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`{ #category : #information }`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ Class {`
`5`	`5`	`'alpha',`
`6`	`6`	`'sum'`
`7`	`7`	`],`
`8`		`- #category : #'Math-Numerical'`
	`8`	`+ #category : #'Math-Distributions-Gamma'`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`{ #category : #information }`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ Class {`
`11`	`11`	`'laplaceDistribution',`
`12`	`12`	`'next'`
`13`	`13`	`],`
`14`		`- #category : #'Math-Numerical'`
	`14`	`+ #category : #'Math-Distributions'`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`{ #category : #testing }`