From b69e96bb65be79460ed59b9d40219a8cba882c7d Mon Sep 17 00:00:00 2001 From: Hemal Varambhia Date: Wed, 19 Jun 2019 23:16:20 +0100 Subject: [PATCH 1/5] [issue-105] Moved the incrementing to the bottom so we can extract the tempering to a method in the next refactor. --- src/Math-Random/PMMersenneTwisterRandomGenerator.class.st | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Math-Random/PMMersenneTwisterRandomGenerator.class.st b/src/Math-Random/PMMersenneTwisterRandomGenerator.class.st index dd16ed7f7..a8eb8c421 100644 --- a/src/Math-Random/PMMersenneTwisterRandomGenerator.class.st +++ b/src/Math-Random/PMMersenneTwisterRandomGenerator.class.st @@ -134,11 +134,11 @@ PMMersenneTwisterRandomGenerator >> nextInteger [ put: ((states at: PeriodParameter) bitXor: ((y bitShift: 1) bitXor: (tempArray at: (y bitAnd: 16r1) + 1))). mti := 0 ]. y := states at: 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). + mti := mti + 1. ^ y ] From 8316b89bc50743f86e9adbbb51adb6bfc1f932af Mon Sep 17 00:00:00 2001 From: Hemal Varambhia Date: Wed, 19 Jun 2019 23:21:15 +0100 Subject: [PATCH 2/5] [issue-105] Extracted the tempering section to an intention-revealing method. --- .../PMMersenneTwisterRandomGenerator.class.st | 49 ++++++++++++------- 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/src/Math-Random/PMMersenneTwisterRandomGenerator.class.st b/src/Math-Random/PMMersenneTwisterRandomGenerator.class.st index a8eb8c421..45191c8ee 100644 --- a/src/Math-Random/PMMersenneTwisterRandomGenerator.class.st +++ b/src/Math-Random/PMMersenneTwisterRandomGenerator.class.st @@ -108,36 +108,38 @@ PMMersenneTwisterRandomGenerator >> nextInteger [ "Answer a random integer on [0,0xffffffff] interval" | tempArray y | - tempArray := Array withAll: #(0 16r9908B0DF). + tempArray := Array withAll: #(0 2567483615). 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 := 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 := self temperAt: mti + 1. mti := mti + 1. ^ y ] @@ -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 +] From d4be044d53a08e738a1cdf1331ec163c584d5e70 Mon Sep 17 00:00:00 2001 From: Hemal Varambhia Date: Tue, 25 Jun 2019 11:13:16 +0100 Subject: [PATCH 3/5] [issue-105] Corrected the categorisation to match the super class's. --- src/Math-Random/PMParkMillerMinimumRandomGenerator.class.st | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Math-Random/PMParkMillerMinimumRandomGenerator.class.st b/src/Math-Random/PMParkMillerMinimumRandomGenerator.class.st index 53c0653c0..429b57b8f 100644 --- a/src/Math-Random/PMParkMillerMinimumRandomGenerator.class.st +++ b/src/Math-Random/PMParkMillerMinimumRandomGenerator.class.st @@ -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 @@ -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." From 18669ee45de5e119997a13a521c99be4e21b711c Mon Sep 17 00:00:00 2001 From: Hemal Varambhia Date: Tue, 25 Jun 2019 21:09:48 +0100 Subject: [PATCH 4/5] [issue-105] Corrected the categorisation to match the super class's. --- src/Math-Random/PMLinearCongruentialRandomGenerator.class.st | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Math-Random/PMLinearCongruentialRandomGenerator.class.st b/src/Math-Random/PMLinearCongruentialRandomGenerator.class.st index 543ad6704..1ad21e0f9 100644 --- a/src/Math-Random/PMLinearCongruentialRandomGenerator.class.st +++ b/src/Math-Random/PMLinearCongruentialRandomGenerator.class.st @@ -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" @@ -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." From 8ff74504136b80986047683ea20fa71ae9bcb14d Mon Sep 17 00:00:00 2001 From: Hemal Varambhia Date: Tue, 25 Jun 2019 22:03:47 +0100 Subject: [PATCH 5/5] [issue-105] Corrected the initialisation. --- src/Math-Random/PMMersenneTwisterRandomGenerator.class.st | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Math-Random/PMMersenneTwisterRandomGenerator.class.st b/src/Math-Random/PMMersenneTwisterRandomGenerator.class.st index 45191c8ee..5a3906bd0 100644 --- a/src/Math-Random/PMMersenneTwisterRandomGenerator.class.st +++ b/src/Math-Random/PMMersenneTwisterRandomGenerator.class.st @@ -108,7 +108,7 @@ PMMersenneTwisterRandomGenerator >> nextInteger [ "Answer a random integer on [0,0xffffffff] interval" | tempArray y | - tempArray := Array withAll: #(0 2567483615). + tempArray := Array withAll: #(0 16r9908B0DF). mti >= DefaultLengthVector ifTrue: [ mti = (DefaultLengthVector + 1) ifTrue: [ self seed: 5489.