Changeset 16621

Timestamp:

02/26/19 13:39:59 (6 years ago)

Author:

gkronber

Message:

#2929: changed code to update the best found solution

File:

• branches/2929_PrioritizedGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.PGE/3.3/PGE.cs (modified) (4 diffs)

branches/2929_PrioritizedGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.PGE/3.3/PGE.cs

@@ -275 +275 @@
       var iterationsResult = new IntValue(0);
       Results.Add(new Result("Iteration", iterationsResult));
-      var bestTestScoreResult = new IntValue(0); // TODO: why is test score an int?
-      Results.Add(new Result("Best test score", bestTestScoreResult));
+      var bestMSEResult = new DoubleValue(); 
+      Results.Add(new Result("Best MSE", bestMSEResult));
       var testScoresTable = new DataTable("Test scores");
       var bestTestScoreRow = new DataRow("Best test score");
@@ -294 +294 @@
       Results.Add(bestSolutionResult);
 
+      var allSolutions = new ItemList<IRegressionSolution>();
+      var allSolutionsResult = new Result("Solutions", allSolutions);
+      Results.Add(allSolutionsResult);
+
       // TODO: the following is potentially problematic for other go processes run on the same machine at the same time
       // shouldn't be problematic bc is inherited only, normally only child processes are affected
@@ -341 +345 @@
         ProblemTypeString: problemTypeString, numProcs: numProc);
 
-      var bestTestScore = int.MaxValue;
+      var bestMSE = double.MaxValue;
       for (int iter = 1; iter <= MaxIterations; iter++) {
         iterationsResult.Value = iter;
@@ -360 +364 @@
           log.LogMessage("Push/Pop (" + iResult + ", " + testScore + ") " + eqnStr + " coeff: " + string.Join(" ", coeff));
 
-          if (!string.IsNullOrEmpty(eqnStr) && (testScore < bestTestScore)) {
-            // update best quality
-            bestTestScore = testScore;
-            bestTestScoreResult.Value = testScore;
+          if (!string.IsNullOrEmpty(eqnStr)) {
             var sol = CreateSolution(problemData, eqnStr, coeff, problemData.AllowedInputVariables.ToArray());
-            bestSolutionResult.Value = sol;
+            allSolutions.Add(sol);
+            if (sol.TrainingMeanSquaredError < bestMSE) {
+              // update best quality
+              bestMSE = sol.TrainingMeanSquaredError;
+              bestMSEResult.Value = bestMSE;
+              bestSolutionResult.Value = sol;
+            }
           }
-          bestTestScoreRow.Values.Add(bestTestScoreResult.Value); // always add the current best test score to data row
+          bestTestScoreRow.Values.Add(bestMSEResult.Value); // always add the current best test score to data row
           curTestScoreRow.Values.Add(testScore);
         }