Changeset 5742

Timestamp:

03/17/11 21:40:31 (14 years ago)

Author:

gkronber

Message:

#1418 fixed grammar cloning bug, improved analyzers for multi objective symbolic data analysis problems.

Location:

branches/DataAnalysis Refactoring

Files:

• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionGrammar.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/MultiObjective/SymbolicRegressionMultiObjectiveProblem.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionSingleObjectivePearsonRSquaredEvaluator.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisMultiObjectiveTrainingBestSolutionAnalyzer.cs (modified) (6 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisMultiObjectiveValidationBestSolutionAnalyzer.cs (modified) (4 diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/OnlineEvaluators/OnlineCovarianceEvaluator.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/OnlineEvaluators/OnlineMeanAbsolutePercentageErrorEvaluator.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/OnlineEvaluators/OnlinePearsonsRSquaredEvaluator.cs (modified) (2 diffs)

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionGrammar.cs

@@ -21 +21 @@
 
 using HeuristicLab.Common;
+using System.Linq;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using System.Collections.Generic;
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
@@ -104 +106 @@
       startSymbol = (StartSymbol)cloner.Clone(original.StartSymbol);
       defunSymbol = (Defun)cloner.Clone(original.defunSymbol);
+      symbols = original.symbols
+        .ToDictionary(x => x.Key, y => (ISymbol)cloner.Clone(y.Value));
       maximumFunctionArguments = original.maximumFunctionArguments;
       minimumFunctionArguments = original.minimumFunctionArguments;

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/MultiObjective/SymbolicRegressionMultiObjectiveProblem.cs

@@ -66 +66 @@
       Parameters.Add(new FixedValueParameter<DoubleValue>(UpperEstimationLimitParameterName, UpperEstimationLimitParameterDescription, new DoubleValue()));
 
-      Maximization = new BoolArray(new bool[] { false, false });
+      Maximization = new BoolArray(new bool[] { true, false });
       MaximumSymbolicExpressionTreeDepth.Value = InitialMaximumTreeDepth;
       MaximumSymbolicExpressionTreeLength.Value = InitialMaximumTreeLength;

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionSingleObjectivePearsonRSquaredEvaluator.cs

@@ -26 +26 @@
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using System.Linq;
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression {
@@ -54 +55 @@
       IEnumerable<double> estimatedValues = interpreter.GetSymbolicExpressionTreeValues(solution, problemData.Dataset, rows);
       IEnumerable<double> originalValues = problemData.Dataset.GetEnumeratedVariableValues(problemData.TargetVariable, rows);
-      IEnumerable<double> boundedEstimatedValues = estimatedValues.LimitToRange(lowerEstimationLimit, upperEstimationLimit);
-      return OnlinePearsonsRSquaredEvaluator.Calculate(originalValues, boundedEstimatedValues);
+      return OnlinePearsonsRSquaredEvaluator.Calculate(estimatedValues, originalValues);
     }
 

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisMultiObjectiveTrainingBestSolutionAnalyzer.cs

@@ -30 +30 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using System;
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
@@ -95 +96 @@
         if (IsNonDominated(qualities[i], trainingBestQualities, maximization) &&
           IsNonDominated(qualities[i], qualities, maximization)) {
-          newNonDominatedQualities.Add(qualities[i]);
-          nonDominatedIndexes.Add(i);
+          if (!newNonDominatedQualities.Contains(qualities[i], new DoubleArrayComparer())) {
+            newNonDominatedQualities.Add(qualities[i]);
+            nonDominatedIndexes.Add(i);
+          }
         }
       }
@@ -113 +116 @@
         for (int i = 0; i < trainingBestQualities.Count; i++) {
           if (IsNonDominated(trainingBestQualities[i], newNonDominatedQualities, maximization)) {
-            nonDominatedSolutions.Add(TrainingBestSolutions[i]);
-            nonDominatedQualities.Add(TrainingBestSolutionQualities[i]);
+            if (!newNonDominatedQualities.Contains(trainingBestQualities[i], new DoubleArrayComparer())) {
+              nonDominatedSolutions.Add(TrainingBestSolutions[i]);
+              nonDominatedQualities.Add(TrainingBestSolutionQualities[i]);
+            }
           }
         }
@@ -125 +130 @@
     }
 
+    private class DoubleArrayComparer : IEqualityComparer<double[]> {
+      public bool Equals(double[] x, double[] y) {
+        if (y.Length != x.Length) throw new ArgumentException();
+        for (int i = 0; i < x.Length;i++ ) {
+          if (!x[i].IsAlmost(y[i])) return false;
+        }
+        return true;
+      }
+
+      public int GetHashCode(double[] obj) {
+        int c = obj.Length;
+        for (int i = 0; i < obj.Length; i++)
+          c ^= obj[i].GetHashCode();
+        return c;
+      }
+    }
+
     protected abstract T CreateSolution(ISymbolicExpressionTree bestTree, double[] bestQuality);
 
@@ -131 +153 @@
         bool refPointDominatesPoint = true;
         for (int i = 0; i < point.Length; i++) {
-          refPointDominatesPoint &= IsBetter(refPoint[i], point[i], maximization[i]);
+          refPointDominatesPoint &= IsBetterOrEqual(refPoint[i], point[i], maximization[i]);
         }
         if (refPointDominatesPoint) return false;
@@ -137 +159 @@
       return true;
     }
-    private bool IsBetter(double lhs, double rhs, bool maximization) {
+    private bool IsBetterOrEqual(double lhs, double rhs, bool maximization) {
       if (maximization) return lhs > rhs;
       else return lhs < rhs;

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisMultiObjectiveValidationBestSolutionAnalyzer.cs

@@ -30 +30 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using System;
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
@@ -120 +121 @@
         if (IsNonDominated(qualities[i], trainingBestQualities, maximization) &&
           IsNonDominated(qualities[i], qualities, maximization)) {
-          newNonDominatedQualities.Add(qualities[i]);
-          nonDominatedIndexes.Add(i);
+          if (!newNonDominatedQualities.Contains(qualities[i], new DoubleArrayComparer())) {
+            newNonDominatedQualities.Add(qualities[i]);
+            nonDominatedIndexes.Add(i);
+          }
         }
       }
@@ -138 +141 @@
         for (int i = 0; i < trainingBestQualities.Count; i++) {
           if (IsNonDominated(trainingBestQualities[i], newNonDominatedQualities, maximization)) {
-            nonDominatedSolutions.Add(ValidationBestSolutions[i]);
-            nonDominatedQualities.Add(ValidationBestSolutionQualities[i]);
+            if (!newNonDominatedQualities.Contains(trainingBestQualities[i], new DoubleArrayComparer())) {
+              nonDominatedSolutions.Add(ValidationBestSolutions[i]);
+              nonDominatedQualities.Add(ValidationBestSolutionQualities[i]);
+            }
           }
         }
@@ -166 +171 @@
       else return lhs < rhs;
     }
+
+    private class DoubleArrayComparer : IEqualityComparer<double[]> {
+      public bool Equals(double[] x, double[] y) {
+        if (y.Length != x.Length) throw new ArgumentException();
+        for (int i = 0; i < x.Length; i++) {
+          if (!x[i].IsAlmost(y[i])) return false;
+        }
+        return true;
+      }
+
+      public int GetHashCode(double[] obj) {
+        int c = obj.Length;
+        for (int i = 0; i < obj.Length; i++)
+          c ^= obj[i].GetHashCode();
+        return c;
+      }
+    }
+
   }
 }

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/OnlineEvaluators/OnlineCovarianceEvaluator.cs

@@ -30 +30 @@
     public double Covariance {
       get {
-        if (n < 1)
-          throw new InvalidOperationException("No elements");
-        else
-          return Cn / n;
+        return n > 0 ? Cn / n : 0.0;
       }
     }

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/OnlineEvaluators/OnlineMeanAbsolutePercentageErrorEvaluator.cs

@@ -31 +31 @@
     public double MeanAbsolutePercentageError {
       get {
-        if (n < 1)
-          throw new InvalidOperationException("No elements");
-        else
-          return sre / n;
+        return n > 0 ? sre / n : 0.0;
       }
     }

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/OnlineEvaluators/OnlinePearsonsRSquaredEvaluator.cs

@@ -66 +66 @@
     #endregion
 
-    private bool IsInvalidValue(double x) {
+    private static bool IsInvalidValue(double x) {
       return double.IsNaN(x) || double.IsInfinity(x);
     }
@@ -79 +79 @@
         double estimated = secondEnumerator.Current;
         double original = firstEnumerator.Current;
-        rSquaredEvaluator.Add(original, estimated);
+        if (!IsInvalidValue(estimated) && !IsInvalidValue(original))
+          rSquaredEvaluator.Add(original, estimated);
       }