Changeset 13669 for trunk/sources

Timestamp:

03/08/16 20:10:16 (9 years ago)

Author:

gkronber

Message:

#2581: made policies storable and added iteration of best solution to results

Location:

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/MctsSymbolicRegression

Files:

• MctsSymbolicRegressionAlgorithm.cs (modified) (5 diffs)
• MctsSymbolicRegressionStatic.cs (modified) (1 diff)
• Policies/EpsGreedy.cs (modified) (2 diffs)
• Policies/PolicyBase.cs (modified) (1 diff)
• Policies/Ucb.cs (modified) (2 diffs)
• Policies/UcbTuned.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/MctsSymbolicRegression/MctsSymbolicRegressionAlgorithm.cs

@@ -209 +209 @@
       Results.Add(new Result("Iterations", iterations));
 
+      var bestSolutionIteration = new IntValue(0);
+      Results.Add(new Result("Best solution iteration", bestSolutionIteration));
+
       var table = new DataTable("Qualities");
       table.Rows.Add(new DataRow("Best quality"));
@@ -261 +264 @@
       double bestQ = 0.0;
       double curBestQ = 0.0;
-      double q = 0.0;
       int n = 0;
       // Loop until iteration limit reached or canceled.
@@ -267 +269 @@
         cancellationToken.ThrowIfCancellationRequested();
 
-        q = MctsSymbolicRegressionStatic.MakeStep(state);
+        var q = MctsSymbolicRegressionStatic.MakeStep(state);
         sumQ += q; // sum of qs in the last updateinterval iterations
         curBestQ = Math.Max(q, curBestQ); // the best q in the last updateinterval iterations
@@ -274 +276 @@
         // iteration results
         if (n == updateInterval) {
+          if (bestQ > bestQuality.Value) {
+            bestSolutionIteration.Value = i;
+          }
           bestQuality.Value = bestQ;
           curQuality.Value = curBestQ;
@@ -295 +300 @@
       // final results
       if (n > 0) {
+        if (bestQ > bestQuality.Value) {
+          bestSolutionIteration.Value = iterations.Value + n;
+        }
         bestQuality.Value = bestQ;
         curQuality.Value = curBestQ;

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/MctsSymbolicRegression/MctsSymbolicRegressionStatic.cs

@@ -418 +418 @@
         }
       }
-      // no final state -> select a random child
+      // no final state -> select a the first child
       if (selectedChildIdx == -1) {
-        selectedChildIdx = rand.Next(tree.children.Length);
+        selectedChildIdx = 0;
       }
       return tree.children[selectedChildIdx];

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/MctsSymbolicRegression/Policies/EpsGreedy.cs

@@ -9 +9 @@
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Algorithms.DataAnalysis.MctsSymbolicRegression.Policies {
+  [StorableClass]
   [Item("EpsilonGreedy", "Epsilon greedy policy with parameter eps to balance between exploitation and exploration")]
   public class EpsilonGreedy : PolicyBase {
@@ -30 +32 @@
     }
 
+    [StorableConstructor]
+    protected EpsilonGreedy(bool deserializing) : base(deserializing) { }
     protected EpsilonGreedy(EpsilonGreedy original, Cloner cloner)
       : base(original, cloner) {

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/MctsSymbolicRegression/Policies/PolicyBase.cs

@@ -16 +16 @@
 
     [StorableConstructor]
-    private PolicyBase(bool deserializing) : base(deserializing) { }
+    protected PolicyBase(bool deserializing) : base(deserializing) { }
     protected PolicyBase(PolicyBase original, Cloner cloner)
       : base(original, cloner) {

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/MctsSymbolicRegression/Policies/Ucb.cs

@@ -9 +9 @@
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Algorithms.DataAnalysis.MctsSymbolicRegression.Policies {
+  [StorableClass]
   [Item("Ucb Policy", "Ucb with parameter c to balance between exploitation and exploration")]
   public class Ucb : PolicyBase {
@@ -30 +32 @@
     }
 
+    [StorableConstructor]
+    protected Ucb(bool deserializing) : base(deserializing) { }
     protected Ucb(Ucb original, Cloner cloner)
       : base(original, cloner) {

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/MctsSymbolicRegression/Policies/UcbTuned.cs

@@ -9 +9 @@
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Algorithms.DataAnalysis.MctsSymbolicRegression.Policies {
+  [StorableClass]
   [Item("UcbTuned Policy", "UcbTuned is similar to Ucb but tracks empirical variance. Use parameter c to balance between exploitation and exploration")]
   public class UcbTuned : PolicyBase {
@@ -32 +34 @@
     }
 
+    [StorableConstructor]
+    protected UcbTuned(bool deserializing) : base(deserializing) { }
     protected UcbTuned(UcbTuned original, Cloner cloner)
       : base(original, cloner) {