Changeset 16335

Timestamp:

11/30/18 14:12:11 (6 years ago)

Author:

gkronber

Message:

#2929 changed criterion for updating the solution to testScore < bestTestScore

File:

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

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

@@ -290 +290 @@
       Results.Add(new Result("Lengths", lengthsTable));
 
+
       var bestSolutionResult = new Result("Best solution", typeof(IRegressionSolution));
       Results.Add(bestSolutionResult);
@@ -356 +357 @@
         ProblemTypeString: cProblemTypeString, numProcs: numProc);
 
+      var bestTestScore = int.MaxValue;
       for (int iter = 1; iter <= MaxIterations; iter++) {
         iterationsResult.Value = iter;
@@ -378 +380 @@
           log.LogMessage("Push/Pop (" + iResult + ", " + bestlen1 + ", " + bestlen2 + ", " + testScore + ", noBestPush: " + (nobestpush > 0) + ", bestNewMin: " + (bestNewMinError > 0) + ") " + eqnStr + " coeff: " + string.Join(" ", coeff));
 
-          if (bestNewMinError > 0) {
+          if (testScore < bestTestScore) {
             // update best quality
+            bestTestScore = testScore;
             bestTestScoreResult.Value = testScore;
             var sol = CreateSolution(problemData, eqnStr, coeff, problemData.AllowedInputVariables.ToArray());