Merge pull request #273 from olekscode/269-Remove-random-methods

Fixed 269. Remove random methods from Number and Integer

Author: olekscode

src/Math-Chromosome/PMChromosomeManager.class.st

@@ -5,9 +5,10 @@ Class {
 		'population',
 		'populationSize',
 		'rateOfMutation',
-		'rateOfCrossover'
+		'rateOfCrossover',
+		'randomNumberGenerator'
 	],
-	#category : 'Math-Chromosome'
+	#category : #'Math-Chromosome'
 }
 
 { #category : #creation }
@@ -28,6 +29,12 @@ PMChromosomeManager >> crossover: aChromosome1 and: aChromosome2 [
 	^self subclassResponsibility
 ]
 
+{ #category : #initialization }
+PMChromosomeManager >> initialize [ 
+	super initialize.
+	randomNumberGenerator := Random new.
+]
+
 { #category : #information }
 PMChromosomeManager >> isFullyPopulated [
 
@@ -56,7 +63,7 @@ PMChromosomeManager >> populationSize: anInteger [
 PMChromosomeManager >> process: aChromosome1 and: aChromosome2 [ 
 
 	| roll |
-	roll := Number random.
+	roll := randomNumberGenerator next.
 	roll < rateOfCrossover 
 		ifTrue: [population addAll: (self crossover: aChromosome1 and: aChromosome2)]
 		ifFalse: 

src/Math-Chromosome/PMVectorChromosomeManager.class.st

@@ -5,28 +5,33 @@ Class {
 		'origin',
 		'range'
 	],
-	#category : 'Math-Chromosome'
+	#category : #'Math-Chromosome'
 }
 
 { #category : #operation }
 PMVectorChromosomeManager >> crossover: aChromosome1 and: aChromosome2 [
 
-	| index new1 new2|
-	index := ( aChromosome1 size - 1) random + 2.
+	| index new1 new2 |
+
+	index := randomNumberGenerator nextIntegerBetween: 2 and: aChromosome1 size.
+
 	new1 := self clone: aChromosome1.
 	new1 replaceFrom: index to: new1 size with: aChromosome2 startingAt: index.
+	
 	new2 := self clone: aChromosome2.
 	new2 replaceFrom: index to: new2 size with: aChromosome1 startingAt: index.
-	^Array with: new1 with: new2
+	
+	^ Array with: new1 with: new2
 ]
 
 { #category : #operation }
 PMVectorChromosomeManager >> mutate: aVector [
 
 	| index |
-	index := aVector size random + 1.
+	index := randomNumberGenerator nextIntegerBetween: 1 and: aVector size.
+
 	^( aVector copy)
-			at: index put: ( self randomComponent: index);
+			at: index put: (self randomComponent: index);
 			yourself
 ]
 
@@ -39,13 +44,13 @@ PMVectorChromosomeManager >> origin: aVector [
 { #category : #creation }
 PMVectorChromosomeManager >> randomChromosome [
 
-	^( ( 1 to: origin size) collect: [ :n | self randomComponent: n]) asPMVector
+	^ ((1 to: origin size) collect: [ :n | self randomComponent: n ]) asPMVector
 ]
 
 { #category : #information }
 PMVectorChromosomeManager >> randomComponent: anInteger [
 
-	^( range at: anInteger) asFloat random + ( origin at: anInteger)
+	^ (randomNumberGenerator nextBetween: 0 and: (range at: anInteger)) + (origin at: anInteger)
 ]
 
 { #category : #initialization }

src/Math-Complex/PMComplex.class.st

@@ -102,9 +102,13 @@ PMComplex class >> one [
 
 { #category : #'*Math-Complex' }
 PMComplex class >> random [
-		"Answers a random number with abs between 0 and 1." 
-
-	^ self abs: 1.0 random arg: 2 * Float pi random
+	"Answers a random number with abs between 0 and 1." 
+	| random |
+	random := Random new.
+	
+	^ self
+		abs: random next
+		arg: 2 * (random nextBetween: 0 and: Float pi)
 ]
 
 { #category : #'instance creation' }

src/Math-Complex/PMComplex.extension.st

@@ -17,20 +17,24 @@ PMComplex >> productWithVector: aVector [
 	^ aVector collect: [ :each | each * self ]
 ]
 
-{ #category : #'*Math-Complex' }
-PMComplex class >> random [
-		"Answers a random number with abs between 0 and 1." 
-
-	^ self abs: 1.0 random arg: 2 * Float pi random
-]
-
 { #category : #'*Math-Complex' }
 PMComplex >> random [
 	"analog to Number>>random. However, the only bound is that the abs of the produced complex is less than the length of the receive. The receiver effectively defines a disc within which the random element can be produced."
 	^ self class random * self
 
 ]
 
+{ #category : #'*Math-Complex' }
+PMComplex class >> random [
+	"Answers a random number with abs between 0 and 1." 
+	| random |
+	random := Random new.
+	
+	^ self
+		abs: random next
+		arg: 2 * (random nextBetween: 0 and: Float pi)
+]
+
 { #category : #'*Math-Complex' }
 PMComplex >> subtractToPolynomial: aPolynomial [
 	^ aPolynomial addNumber: self negated

src/Math-Core-Distribution/PMNormalDistribution.class.st

@@ -13,15 +13,20 @@ Class {
 
 { #category : #information }
 PMNormalDistribution class >> boxMullerTransform [
-|v1 v2 w y|
-			[ v1 := Number random * 2 - 1.
-			v2 := Number random * 2 - 1.
-			w := v1 squared + v2 squared.
-			w > 1 ] whileTrue.
-			y := (w ln * 2 negated / w) sqrt.
-			v1 := y * v1.
-			NextRandom := y * v2.
-			^v1.
+	| random v1 v2 w y |
+	random := Random new.
+	
+	[
+		v1 :=random next * 2 - 1.
+		v2 := random next * 2 - 1.
+		w := v1 squared + v2 squared.
+		w > 1
+	] whileTrue.
+			
+	y := (w ln * 2 negated / w) sqrt.
+	v1 := y * v1.
+	NextRandom := y * v2.
+	^v1.
 ]
 
 { #category : #information }

src/Math-Core/PMVector.class.st

@@ -27,8 +27,12 @@ Class {
 PMVector class >> new: size random: maxRandomNumber [ 
 	"Answer an instance of me, with number of elements equal to size, each 
 	a randomNumber lower than maxRandomNumber ."
+	
+	| random |
+	random := Random new.
 
-	^self newFrom:  ( (1 to: size ) collect: [:e|maxRandomNumber random ]  )
+	^ self newFrom: ((1 to: size ) collect: [ :each |
+		random nextBetween: 0 and: maxRandomNumber ]).
 ]
 
 { #category : #private }
@@ -43,10 +47,14 @@ PMVector class >> ones: anInteger [
 { #category : #private }
 PMVector class >> randomSize: anInteger maxNumber: aMaxNumber [
 	"Creates a vector of rand numbers from 0 to aMaxNumber."
-	|a|
-	a := PMVector new: anInteger.
-	1 to: a size do: [ :n | a at: n put: (aMaxNumber random)].
-	^a
+	| random vector |
+	random := Random new.
+	
+	vector := PMVector new: anInteger.
+	1 to: vector size do: [ :i |
+		vector at: i put: (random nextBetween: 0 and: aMaxNumber)].
+	
+	^ vector
 ]
 
 { #category : #private }

src/Math-FunctionFit/PMAnotherChromosomeManager.class.st

@@ -13,7 +13,7 @@ Class {
 	#classVars : [
 		'Primes'
 	],
-	#category : 'Math-FunctionFit'
+	#category : #'Math-FunctionFit'
 }
 
 { #category : #utils }
@@ -34,18 +34,27 @@ PMAnotherChromosomeManager class >> integerDigitsFor: anInteger base: aBase [
 
 { #category : #utils }
 PMAnotherChromosomeManager class >> numberOfHamersleyPoints: n dimension: d randomized: aBoolean [
-"a bit randomized "
-|dist|
-dist :=1.0 / n.
-^(1 to:  n) collect: [:number| (1 to: d)collect: [:dim|
-		( dim=1)
-		ifTrue:[aBoolean ifTrue: [(number/n)- dist random] 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 + dist random] ifFalse: [sum] ] ]]. 
+	"a bit randomized "
+	| dist randomNumberGenerator |
+	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 ] ] ]]. 
 ]
 
 { #category : #'instance creation' }
@@ -57,27 +66,44 @@ PMAnotherChromosomeManager class >> origin: anArray range: anotherArray [
 PMAnotherChromosomeManager >> crossover: aChromosome1 and: aChromosome2 [
 "the Discrete Recombination  operator
 that does not prefer schemata of certain parameters based on their position"
-|new1 new2|
-	aChromosome1=aChromosome2 ifTrue:[^Array with:( self mutate: aChromosome2) with: (self mutate: aChromosome1) ].
+	| new1 new2 |
+	
+	aChromosome1 = aChromosome2 ifTrue:[
+		^ Array
+			with: (self mutate: aChromosome2)
+			with: (self mutate: aChromosome1) ].
+	
 	new1 := self clone: aChromosome1.
 	new2 := self clone: aChromosome2.
-	2 to: new1 size do: [:i| (Float random <0.5)ifTrue:[
+	
+	2 to: new1 size do: [ :i |
+		(randomNumberGenerator next < 0.5) ifTrue: [
 			new1 at: i put: (aChromosome2 at: i).
-			new2 at: i put: (aChromosome1 at: i)]].
-	^Array with: new1 with: new2
+			new2 at: i put: (aChromosome1 at: i) ] ].
+	
+	^ Array with: new1 with: new2
 ]
 
 { #category : #operation }
 PMAnotherChromosomeManager >> eirCrossover: aChromosome1 and: aChromosome2 [
-"the Extended Intermediate Recombination  0.5 operator, slightly changed to make it more similar to linecrossover (distribution is more centered around Chromosome1, which is better than C2)"
-| r new1 new2 dif|
-dif:=aChromosome2 - aChromosome1.
-dif norm=0 ifTrue:[^Array with:( self mutate: aChromosome2) with: (self mutate: aChromosome1) ].
-r:=(1 to: aChromosome1 size) collect:[:i| 2.0 random -0.5] .
-new1 := aChromosome1+ (r * dif).
-r:=(1 to: aChromosome1 size) collect:[:i| 1.0 random -0.5] .
-new2 := aChromosome1+ (r * dif).
-^Array with: new1 with: new2
+	"the Extended Intermediate Recombination  0.5 operator, slightly changed to make it more similar to linecrossover (distribution is more centered around Chromosome1, which is better than C2)"
+	| randomNumbers new1 new2 dif |
+	dif := aChromosome2 - aChromosome1.
+	
+	dif norm = 0 ifTrue: [
+		^ { self mutate: aChromosome2 . self mutate: aChromosome1 } ].
+	
+	randomNumbers := (1 to: aChromosome1 size) collect: [ :i |
+		randomNumberGenerator nextBetween: -0.5 and: 1.5 ].
+	
+	new1 := aChromosome1 + (randomNumbers * dif).
+	
+	randomNumbers := (1 to: aChromosome1 size) collect: [ :i |
+		randomNumberGenerator nextBetween: -0.5 and: 0.5 ].
+	
+	new2 := aChromosome1 + (randomNumbers * dif).
+	
+	^ { new1 . new2 }
 
 ]
 
@@ -116,20 +142,25 @@ PMAnotherChromosomeManager >> lineCrossOver: aChromosome1 and: aChromosome2 [
 
 { #category : #operation }
 PMAnotherChromosomeManager >> mutate: aVector [
-"BGA mutation"
-	| isMutated threshold new index|
-	isMutated :=false.
-	threshold :=1/ aVector size asFloat .
-	new :=aVector copy.
-	1 to: aVector size do:[:i| Float random < threshold ifTrue:[
-			isMutated :=true.
+	"BGA mutation"
+	| isMutated threshold new index |
+	
+	isMutated := false.
+	threshold := 1 / aVector size asFloat.
+	new := aVector copy.
+	
+	1 to: aVector size do: [ :i |
+		randomNumberGenerator next < threshold ifTrue: [
+			isMutated := true.
 			new at: i put: (new at: i) + 
-			((Float random <0.5 ifTrue: [0.5] ifFalse:[0.5 negated ] )*(self randomRangeAt: i))]].
+				((randomNumberGenerator next < 0.5 ifTrue: [ 0.5 ] ifFalse:[ -0.5 ]) * (self randomRangeAt: i)) ] ].
+	
 	isMutated ifFalse: [
-		index := aVector size random + 1.
+		index := randomNumberGenerator nextIntegerBetween: 1 and: aVector size.
 		new at: index put: (new at: index) + 
-			((Float random <0.5 ifTrue: [0.5] ifFalse:[0.5 negated ] )*(self randomRangeAt: index))].
-	^new
+			((randomNumberGenerator next < 0.5 ifTrue: [ 0.5 ] ifFalse:[ -0.5 ]) * (self randomRangeAt: index)) ].
+	
+	^ new
 ]
 
 { #category : #accessing }
@@ -156,7 +187,7 @@ PMAnotherChromosomeManager >> printOn: aStream [
 { #category : #operation }
 PMAnotherChromosomeManager >> process: aChromosome1 and: aChromosome2 [ 
 	| roll |
-	roll := Number random.
+	roll := randomNumberGenerator next.
 	roll < rateOfCrossover 
 		ifTrue: [population addAll: (self crossover: aChromosome1 and: aChromosome2)]
 		ifFalse: 
@@ -224,8 +255,8 @@ PMAnotherChromosomeManager >> rateOfMutation: aNumber [
 
 { #category : #private }
 PMAnotherChromosomeManager >> smallDistribution [
-"an exponential distribution as used by H. Mühlenbein"
-^2 raisedTo: (16 *Float random negated)
+	"an exponential distribution as used by H. Mühlenbein"
+	^ 2 raisedTo: (16 * randomNumberGenerator next negated)
 ]
 
 { #category : #private }

src/Math-Matrix/PMMatrix.class.st

@@ -146,14 +146,16 @@ PMMatrix class >> rows: nRows columns: nCols  element: fillElement [
 ]
 
 { #category : #'as yet unclassified' }
-PMMatrix class >> rows: rows columns: columns random: aMaxNumber [
+PMMatrix class >> rows: aNumberOfRows columns: aNumberOfColumns random: aMaxNumber [
 	"Answer a new Matrix of the given dimensions filled with random numbers"
-	|a b|
-	a:=	(1 to: rows) collect: [:row |b:=PMVector new:columns .
-		1 to: columns do: [:column |
-			b  at: column put: (aMaxNumber random)].
-		b].
-	^PMMatrix rows: a
+	| random rows |
+	random := Random new.
+	
+	rows := (1 to: aNumberOfRows) collect: [ :i |
+		(1 to: aNumberOfColumns) collect: [ :j |
+			random nextBetween: 0 and: aMaxNumber ] ].
+	
+	^ self rows: rows
 ]
 
 { #category : #'instance creation' }