Changeset 9475 for branches/LearningClassifierSystems/HeuristicLab.Optimization.Operators.LCS/3.3

Timestamp:

05/09/13 18:57:22 (11 years ago)

Author:

sforsten

Message:

#1980: several small bug fixes

Location:

branches/LearningClassifierSystems/HeuristicLab.Optimization.Operators.LCS/3.3

Files:

• GAssist/MDL/MDLCalculator.cs (modified) (3 diffs)
• Selection/NichingTournamentSelector.cs (modified) (1 diff)

branches/LearningClassifierSystems/HeuristicLab.Optimization.Operators.LCS/3.3/GAssist/MDL/MDLCalculator.cs

@@ -82 +82 @@
         double error = bestSolution.TrainingExceptionsLength;
         double tl = (bestSolution.TrainingTheoryLength * bestSolution.Classes) / bestSolution.TrainingNumberOfAliveRules;
+        if (tl.IsAlmost(0.0)) {
+          //as done in the original implementation
+          tl = 0.00000001;
+        }
         theoryWeight = (initialTheoryLengthRatio / (1.0 - initialTheoryLengthRatio)) * (error / tl);
         iterationsSinceBest = 0;
@@ -87 +91 @@
 
       if (activated && !fixedWeight &&
-        GetLastIterationsAccuracyAverage(weightAdaptionIterations) == 1.0) {
+        GetLastIterationsAccuracyAverage(weightAdaptionIterations).IsAlmost(1.0)) {
         fixedWeight = true;
       }
 
       if (activated && !fixedWeight) {
-        if (bestSolution.TrainingAccuracy != 1.0) {
+        if (bestSolution.TrainingAccuracy.IsAlmost(1.0)) {
           if (iterationsSinceBest == weightAdaptionIterations) {
             theoryWeight *= weightRelaxFactor;
@@ -100 +104 @@
       }
 
-      //if (currentIteration != 0) {
       UpdateStatistic(bestSolution.TrainingAccuracy);
-      //}
     }
 

branches/LearningClassifierSystems/HeuristicLab.Optimization.Operators.LCS/3.3/Selection/NichingTournamentSelector.cs

@@ -83 +83 @@
       //check if list with indexes is as long as the original scope list
       //otherwise invalid quality values were filtered
-      if (qualities.Count != scopes.Count && individuals.Count != scopes.Count) {
+      if (qualities.Count != scopes.Count || individuals.Count != scopes.Count) {
         throw new ArgumentException("The scopes contain invalid quality values (either infinity or double.NaN) on which the selector cannot operate.");
       }