Changeset 13583 for branches/PerformanceComparison/HeuristicLab.Analysis.FitnessLandscape/3.3/DistanceCalculators

Timestamp:

02/02/16 14:10:53 (8 years ago)

Author:

abeham

Message:

#2457:

• Added stripped-down version of FLA branch
• Added appropriate calculators
• Fixed detecting maximization in RLD view

Location:

branches/PerformanceComparison/HeuristicLab.Analysis.FitnessLandscape

Files:

• . (copied) (copied from branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape)
• 3.3 (added)
• 3.3/DistanceCalculators (copied) (copied from branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/DistanceCalculators)
• 3.3/DistanceCalculators/BinaryVectorDistanceCalculator.cs (modified) (1 diff)
• 3.3/DistanceCalculators/IItemDistanceCalculator.cs (modified) (1 diff)
• 3.3/DistanceCalculators/PermutationDistanceCalculator.cs (modified) (3 diffs)
• 3.3/DistanceCalculators/RealVectorDistanceCalculator.cs (modified) (4 diffs)

branches/PerformanceComparison/HeuristicLab.Analysis.FitnessLandscape/3.3/DistanceCalculators/BinaryVectorDistanceCalculator.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
+using System.Drawing;
+using HeuristicLab.Common;
+using HeuristicLab.Common.Resources;
 using HeuristicLab.Core;
-using HeuristicLab.Common.Resources;
+using HeuristicLab.Encodings.BinaryVectorEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Common;
-using HeuristicLab.Encodings.BinaryVectorEncoding;
-using System.Drawing;
 
 namespace HeuristicLab.Analysis.FitnessLandscape.DistanceCalculators {

branches/PerformanceComparison/HeuristicLab.Analysis.FitnessLandscape/3.3/DistanceCalculators/IItemDistanceCalculator.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using HeuristicLab.Core;
 

branches/PerformanceComparison/HeuristicLab.Analysis.FitnessLandscape/3.3/DistanceCalculators/PermutationDistanceCalculator.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Drawing;
+using HeuristicLab.Common;
+using HeuristicLab.Common.Resources;
 using HeuristicLab.Core;
-using HeuristicLab.Common.Resources;
+using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Common;
-using HeuristicLab.Encodings.BinaryVectorEncoding;
-using HeuristicLab.Encodings.PermutationEncoding;
-using System.Drawing;
 
 namespace HeuristicLab.Analysis.FitnessLandscape.DistanceCalculators {
@@ -63 +81 @@
         case PermutationTypes.RelativeUndirected: return RelativeDistance(a, b);
         default: throw new NotImplementedException("Unknown permutation type " + a.PermutationType);
-      }      
+      }
     }
 
     private double AbsoluteDistance(Permutation a, Permutation b) {
       int mismatches = 0;
-      for (int i = 0; i<a.Length; i++) {
+      for (int i = 0; i < a.Length; i++) {
         if (a[i] != b[i])
           mismatches++;
@@ -87 +105 @@
     }
 
-    private static Point GetEdge(Permutation a, int index) {      
+    private static Point GetEdge(Permutation a, int index) {
       int start = a[index];
-      int end = a[(index + 1)%a.Length];
+      int end = a[(index + 1) % a.Length];
       switch (a.PermutationType) {
         case PermutationTypes.RelativeDirected: return new Point(start, end);

branches/PerformanceComparison/HeuristicLab.Analysis.FitnessLandscape/3.3/DistanceCalculators/RealVectorDistanceCalculator.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
+using System.Drawing;
+using HeuristicLab.Common;
+using HeuristicLab.Common.Resources;
 using HeuristicLab.Core;
-using HeuristicLab.Common.Resources;
+using HeuristicLab.Encodings.BinaryVectorEncoding;
+using HeuristicLab.Encodings.RealVectorEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Common;
-using HeuristicLab.Encodings.BinaryVectorEncoding;
-using System.Drawing;
-using HeuristicLab.Encodings.RealVectorEncoding;
 
 namespace HeuristicLab.Analysis.FitnessLandscape.DistanceCalculators {
@@ -15 +33 @@
   [Item("RealVectorDistanceCalculator", "Calculates the Euclidian distance of two real vectors")]
   [StorableClass]
-  public class RealVectorDistanceCalculator: NamedItem, IItemDistanceCalculator {
+  public class RealVectorDistanceCalculator : NamedItem, IItemDistanceCalculator {
 
     #region Properties
@@ -52 +70 @@
 
     public double Distance(IItem x, IItem y) {
-      RealVector a = (RealVector )x;
-      RealVector b = (RealVector )y;
+      RealVector a = (RealVector)x;
+      RealVector b = (RealVector)y;
       if (a.Length != b.Length)
         throw new InvalidOperationException("Cannot compare vectors of different lengths");
@@ -63 +81 @@
     }
 
-    private static double Sqr(double x) { return x*x; }
+    private static double Sqr(double x) { return x * x; }
 
     #endregion