Changeset 12573 for branches/FitnessLandscapeAnalysis

Timestamp:

07/02/15 12:50:44 (9 years ago)

Author:

ascheibe

Message:

#2306 hopefully fixed random number generation problem

File:

• branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK/NKLandscape.cs (modified) (5 diffs)

branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK/NKLandscape.cs

@@ -48 +48 @@
       get { return (IValueParameter<BoolMatrix>)Parameters["GeneInteractions"]; }
     }
+    public IValueParameter<IntValue> SeedParameter {
+      get { return (IValueParameter<IntValue>)Parameters["Seed"]; }
+    }
     public IValueParameter<IntValue> InteractionSeedParameter {
       get { return (IValueParameter<IntValue>)Parameters["InteractionSeed"]; }
@@ -90 +93 @@
       get { return WeightsInitializerParameter.Value; }
     }
-    #endregion
-
-    [ThreadStatic]
-    private static MersenneTwister random;
-    public static MersenneTwister Random {
-      get {
-        if (random == null) {
-          random = new MersenneTwister();
-        }
-        return random;
-      }
-    }
+    public IntValue Seed {
+      get { return SeedParameter.Value; }
+    }
+    #endregion
+
+    [Storable]
+    private MersenneTwister random;
 
     [ThreadStatic]
@@ -119 +117 @@
     private NKLandscape(NKLandscape original, Cloner cloner)
       : base(original, cloner) {
+      random = (MersenneTwister)original.random.Clone(cloner);
       RegisterEventHandlers();
     }
     public NKLandscape()
       : base() {
+      random = new MersenneTwister();
+
       Parameters.Add(new ValueParameter<BoolMatrix>("GeneInteractions", "Every column gives the participating genes for each fitness component"));
-      Parameters.Add(new ValueParameter<IntValue>("InteractionSeed", "The seed used for the hash function to generate interaction tables.", new IntValue(Random.Next())));
+      Parameters.Add(new ValueParameter<IntValue>("Seed", "The seed used for the random number generator.", new IntValue(0)));
+      random.Reset(Seed.Value);
+
+      Parameters.Add(new ValueParameter<IntValue>("InteractionSeed", "The seed used for the hash function to generate interaction tables.", new IntValue(random.Next())));
       Parameters.Add(new ValueParameter<IntValue>("NrOfFitnessComponents", "Number of fitness component functions. (nr of columns in the interaction column)", new IntValue(10)));
       Parameters.Add(new ValueParameter<IntValue>("NrOfInteractions", "Number of genes interacting with each other. (nr of True values per column in the interaction matrix)", new IntValue(3)));
@@ -175 +179 @@
       InteractionInitializerParameter.ValueChanged += InteractionInitializerParameter_ValueChanged;
       WeightsInitializerParameter.ValueChanged += WeightsInitializerParameter_ValueChanged;
+      SeedParameter.ValueChanged += SeedParameter_ValueChanged;
+      SeedParameter.Value.ValueChanged += SeedParameter_ValueChanged;
+    }
+
+    private void SeedParameter_ValueChanged(object sender, EventArgs e) {
+      random.Reset(Seed.Value);
+      InteractionSeed.Value = random.Next();
+      InitializeInteractions();
     }
 
@@ -200 +212 @@
           Length,
           NrOfFitnessComponents.Value,
-          NrOfInteractions.Value, Random);
+          NrOfInteractions.Value, random);
     }