Changeset 14690 for branches/PerformanceComparison/HeuristicLab.Analysis.FitnessLandscape/3.3/CharacteristicCalculator

Timestamp:

02/20/17 20:41:33 (8 years ago)

Author:

abeham

Message:

#2457: working on identification of problem instances

File:

• branches/PerformanceComparison/HeuristicLab.Analysis.FitnessLandscape/3.3/CharacteristicCalculator/RandomWalkCalculator.cs (modified) (2 diffs)

branches/PerformanceComparison/HeuristicLab.Analysis.FitnessLandscape/3.3/CharacteristicCalculator/RandomWalkCalculator.cs

@@ -58 +58 @@
       characteristics = cloner.Clone(original.characteristics);
     }
-    public RandomWalkCalculator() {
+    public RandomWalkCalculator() : this(new RandomWalk()) { }
+    public RandomWalkCalculator(RandomWalk walker) {
       Name = ItemName;
       Description = ItemDescription;
-      walker = new RandomWalk();
+      this.walker = walker;
       characteristics = new CheckedItemList<StringValue>(
         new[] { "AutoCorrelation1", "CorrelationLength", "InformationContent",
-        "PartialInformationContent", "DensityBasinInformation", "InformationStability", 
+        "PartialInformationContent", "DensityBasinInformation", "InformationStability",
         "Diversity", "Regularity", "TotalEntropy", "PeakInformationContent",
         "PeakDensityBasinInformation" }.Select(x => new StringValue(x)));
@@ -91 +92 @@
         };
         walker.ExecutionStateChanged += evHandle;
-        walker.Start();
-        waitHandle.WaitOne();
-        walker.ExecutionStateChanged -= evHandle;
+        try {
+          walker.Start();
+          waitHandle.WaitOne();
+        } finally { walker.ExecutionStateChanged -= evHandle; }
       }
       foreach (var p in characteristics.CheckedItems) {
-        yield return new Result("RandomWalk." + walker.MutatorParameter.Value.Name + "." + p.Value.Value, walker.Results[p.Value.Value].Value);
+        var resultName = "RandomWalk." + walker.MutatorParameter.Value.Name + "." + p.Value.Value;
+        IResult result;
+        if (walker.Results.TryGetValue(p.Value.Value, out result)) {
+          yield return new Result(resultName, result.Value);
+        } else yield return new Result(resultName, new DoubleValue(0));
       }
       walker.Prepare(true);