Changeset 13669 for trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/MctsSymbolicRegression/MctsSymbolicRegressionAlgorithm.cs

Timestamp:

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

Author:

gkronber

Message:

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

File:

• trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/MctsSymbolicRegression/MctsSymbolicRegressionAlgorithm.cs (modified) (5 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;