Skip to content

[Issue 105] Math-Random package is messy #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SergeStinckwich merged 5 commits into from
Jun 27, 2019
Merged

[Issue 105] Math-Random package is messy #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b69e96b
[issue-105] Moved the incrementing to the bottom so we can extract th…
hemalvarambhia Jun 19, 2019
8316b89
[issue-105] Extracted the tempering section to an intention-revealing…
hemalvarambhia Jun 19, 2019
d4be044
[issue-105] Corrected the categorisation to match the super class's.
hemalvarambhia Jun 25, 2019
18669ee
[issue-105] Corrected the categorisation to match the super class's.
hemalvarambhia Jun 25, 2019
8ff7450
[issue-105] Corrected the initialisation.
hemalvarambhia Jun 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Math-Random/PMLinearCongruentialRandomGenerator.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Class {
#category : #'Math-Random'
}

{ #category : #accessing }
{ #category : #'stream access' }
PMLinearCongruentialRandomGenerator >> next [
"Answer a pseudo-Random floating point number between 0 and 1. Uses a quick and dirty Linear congruential generator"

Expand All @@ -24,7 +24,7 @@ PMLinearCongruentialRandomGenerator >> nextFloat [
^ seed / 120050.0
]

{ #category : #accessing }
{ #category : #'stream access' }
PMLinearCongruentialRandomGenerator >> peek [
"Answer a pseudo-Random floating point number between 0 and 1. Uses a simple, but fast, Linear Congruential generator."

Expand Down
47 changes: 30 additions & 17 deletions src/Math-Random/PMMersenneTwisterRandomGenerator.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,35 +110,37 @@ PMMersenneTwisterRandomGenerator >> nextInteger [
| tempArray y |
tempArray := Array withAll: #(0 16r9908B0DF).
mti >= DefaultLengthVector
ifTrue: [
mti = (DefaultLengthVector + 1)
ifTrue: [
self seed: 5489.
ifTrue: [ mti = (DefaultLengthVector + 1)
ifTrue: [ self seed: 5489.
self initialize ].
1 to: DefaultLengthVector - PeriodParameter do: [ :kk |
y := ((states at: kk) bitAnd: Mt19937UpperMask) bitOr: ((states at: kk + 1) bitAnd: Mt19937LowerMask).
y := ((states at: kk) bitAnd: Mt19937UpperMask)
bitOr: ((states at: kk + 1) bitAnd: Mt19937LowerMask).
states
at: kk
put:
(((states at: kk + PeriodParameter) bitXor: (y bitShift: 1 negated)) bitXor: (tempArray at: (y bitAnd: 16r1) + 1)) ].
DefaultLengthVector - PeriodParameter + 1 to: DefaultLengthVector - 2 do: [ :kk |
y := ((states at: kk) bitAnd: Mt19937UpperMask) bitOr: ((states at: kk + 1) bitAnd: Mt19937LowerMask).
(((states at: kk + PeriodParameter) bitXor: (y bitShift: 1 negated))
bitXor: (tempArray at: (y bitAnd: 1) + 1)) ].
DefaultLengthVector - PeriodParameter + 1 to: DefaultLengthVector - 2
do: [ :kk |
y := ((states at: kk) bitAnd: Mt19937UpperMask)
bitOr: ((states at: kk + 1) bitAnd: Mt19937LowerMask).
states
at: kk
put:
(((states at: kk + PeriodParameter - DefaultLengthVector + 1) bitXor: (y bitShift: 1 negated))
bitXor: (tempArray at: (y bitAnd: 16r1) + 1)) ].
y := ((states at: DefaultLengthVector) bitAnd: Mt19937UpperMask) bitOr: ((states at: 1) bitAnd: Mt19937LowerMask).
(((states at: kk + PeriodParameter - DefaultLengthVector + 1)
bitXor: (y bitShift: 1 negated))
bitXor: (tempArray at: (y bitAnd: 1) + 1)) ].
y := ((states at: DefaultLengthVector) bitAnd: Mt19937UpperMask)
bitOr: ((states at: 1) bitAnd: Mt19937LowerMask).
states
at: DefaultLengthVector
put: ((states at: PeriodParameter) bitXor: ((y bitShift: 1) bitXor: (tempArray at: (y bitAnd: 16r1) + 1))).
put:
((states at: PeriodParameter)
bitXor: ((y bitShift: 1) bitXor: (tempArray at: (y bitAnd: 1) + 1))).
mti := 0 ].
y := states at: mti + 1.
y := self temperAt: mti + 1.
mti := mti + 1.
y := y bitXor: (y bitShift: 11 negated).
y := y bitXor: ((y bitShift: 7 negated) bitAnd: TemperingMaskB).
y := y bitXor: ((y bitShift: 15 negated) bitAnd: TemperingMaskC).
y := y bitXor: (y bitShift: 18 negated).
^ y
]

Expand All @@ -149,3 +151,14 @@ PMMersenneTwisterRandomGenerator >> peek [
^ self copy next

]

{ #category : #private }
PMMersenneTwisterRandomGenerator >> temperAt: position [
| y |
y := states at: position.
y := y bitXor: (y bitShift: 11 negated).
y := y bitXor: ((y bitShift: 7 negated) bitAnd: TemperingMaskB).
y := y bitXor: ((y bitShift: 15 negated) bitAnd: TemperingMaskC).
y := y bitXor: (y bitShift: 18 negated).
^ y
]
4 changes: 2 additions & 2 deletions src/Math-Random/PMParkMillerMinimumRandomGenerator.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Class {
#category : #'Math-Random'
}

{ #category : #accessing }
{ #category : #'stream access' }
PMParkMillerMinimumRandomGenerator >> next [
"Answer a pseudo-Random floating point number between 0 and 1.
Uses Park and Miller's 'Minimum Standard' congruential generator
Expand All @@ -30,7 +30,7 @@ PMParkMillerMinimumRandomGenerator >> nextFloat [
^ seed / 16r7FFFFFFF asFloat
]

{ #category : #accessing }
{ #category : #'stream access' }
PMParkMillerMinimumRandomGenerator >> peek [
"Answer a pseudo-Random floating point number between 0 and 1.
Uses Park and Miller's 'Minimum Standard' congruential generator."
Expand Down