Changeset 12876 for branches/HeuristicLab.Problems.GrammaticalOptimization-gkr/HeuristicLab.Algorithms.GrammaticalOptimization/Solvers/SequentialSearch.cs

Timestamp:

08/17/15 19:13:19 (9 years ago)

Author:

gkronber

Message:

#2283: implemented first crude version of extreme hunter algorithm in branch

File:

• branches/HeuristicLab.Problems.GrammaticalOptimization-gkr/HeuristicLab.Algorithms.GrammaticalOptimization/Solvers/SequentialSearch.cs (modified) (3 diffs)

branches/HeuristicLab.Problems.GrammaticalOptimization-gkr/HeuristicLab.Algorithms.GrammaticalOptimization/Solvers/SequentialSearch.cs

@@ -201 +201 @@
         var children = n.children;
         if (children == null || !children.Any()) break;
-        var values = children.Select(ch => policy.GetValue(ch.phrase));
-        var maxValue = values.Max();
-        if (maxValue == 0) maxValue = 1.0;
-        if (double.IsPositiveInfinity(maxValue)) maxValue = double.MaxValue;
-
+        var triesEnumerable = children.Select(ch => policy.GetTries(ch.phrase));
+        double maxTries = triesEnumerable.Where(v => !double.IsInfinity(v)).DefaultIfEmpty(1).Max();
+        maxTries = Math.Max(maxTries, 1.0);
         // write phrases
         foreach (var ch in children) {
-          SetColorForValue(policy.GetValue(ch.phrase) / maxValue);
+          SetColorForValue(policy.GetTries(ch.phrase) / maxTries);
           Console.Write(" {0,-4}", ch.phrase.Substring(Math.Max(0, ch.phrase.Length - 3), Math.Min(3, ch.phrase.Length)));
         }
@@ -215 +213 @@
         // write values
         foreach (var ch in children) {
-          SetColorForValue(policy.GetValue(ch.phrase) / maxValue);
-          Console.Write(" {0:F2}", policy.GetValue(ch.phrase) * 10.0);
+          SetColorForValue(policy.GetTries(ch.phrase) / maxTries);
+          if (!double.IsInfinity(policy.GetValue(ch.phrase)))
+            Console.Write(" {0:F2}", policy.GetValue(ch.phrase) * 10.0);
+          else
+            Console.Write(" Inf ");
         }
         Console.WriteLine();
@@ -222 +223 @@
         // write tries
         foreach (var ch in children) {
-          SetColorForValue(policy.GetValue(ch.phrase) / maxValue);
+          SetColorForValue(policy.GetTries(ch.phrase) / maxTries);
           Console.Write(" {0,4}", policy.GetTries(ch.phrase));
         }