Changeset 5742 for branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic

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/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers

Files:

• SymbolicDataAnalysisMultiObjectiveTrainingBestSolutionAnalyzer.cs (modified) (6 diffs)
• SymbolicDataAnalysisMultiObjectiveValidationBestSolutionAnalyzer.cs (modified) (4 diffs)

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;
+      }
+    }
+
   }
 }