Changeset 8083 for branches/FitnessLandscapeAnalysis

Timestamp:

06/21/12 16:51:45 (13 years ago)

Author:

mkommend

Message:

#1877: Corrected errors detected in unit test in HeuristicLab.FitnessLandscapeAnalysis.

Location:

branches/FitnessLandscapeAnalysis

Files:

• HeuristicLab.Analysis.FitnessLandscape.VRP/HeuristicLabAnalysisFitnessLandscapeVRPPlugin.cs.frame (modified) (2 diffs)
• HeuristicLab.Analysis.FitnessLandscape.Views/HeuristicLabAnalysisFitnessLandscapeViewsPlugin.cs.frame (modified) (1 diff)
• HeuristicLab.Analysis.FitnessLandscape/HeuristicLabAnalysisFitnessLandscapePlugin.cs.frame (modified) (1 diff)
• HeuristicLab.Problems.NK.Views/HeuristicLabProblemsNKViewsPlugin.cs.frame (modified) (1 diff)
• HeuristicLab.Problems.NK/BinaryVectorComparers/AverageBitBinaryVectorComparer.cs (modified) (2 diffs)
• HeuristicLab.Problems.NK/BinaryVectorComparers/LexicographicBinaryVectorComparer.cs (modified) (3 diffs)
• HeuristicLab.Problems.NK/BinaryVectorComparers/MedianBitBinaryVectorComparer.cs (modified) (4 diffs)
• HeuristicLab.Problems.NK/HeuristicLab.Problems.NK.csproj (modified) (1 diff)
• HeuristicLab.Problems.NK/HeuristicLabProblemsNKPlugin.cs.frame (modified) (1 diff)
• HeuristicLab.Problems.NK/NKLandscape.cs (modified) (1 diff)

branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape.VRP/HeuristicLabAnalysisFitnessLandscapeVRPPlugin.cs.frame

@@ -27 +27 @@
   [PluginFile("HeuristicLab.Analysis.FitnessLandscape.VRP-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Analysis.FitnessLandscape", "3.3")]
+  [PluginDependency("HeuristicLab.Collections", "3.3")]
   [PluginDependency("HeuristicLab.Common", "3.3")]
   [PluginDependency("HeuristicLab.Common.Resources", "3.3")]  
@@ -32 +33 @@
   [PluginDependency("HeuristicLab.Data", "3.3")]
   [PluginDependency("HeuristicLab.Encodings.PermutationEncoding", "3.3")]
+  [PluginDependency("HeuristicLab.Optimization", "3.3")]
+  [PluginDependency("HeuristicLab.Parameters", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]  
   [PluginDependency("HeuristicLab.Problems.VehicleRouting", "3.3")]

branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape.Views/HeuristicLabAnalysisFitnessLandscapeViewsPlugin.cs.frame

@@ -28 +28 @@
   [PluginDependency("HeuristicLab.ALGLIB", "3.4")]
   [PluginDependency("HeuristicLab.Analysis.FitnessLandscape", "3.3")]
-  [PluginDependency("HeuristicLab.Collections", "3.3")]
   [PluginDependency("HeuristicLab.Common", "3.3")]
   [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
   [PluginDependency("HeuristicLab.Core", "3.3")]
   [PluginDependency("HeuristicLab.Core.Views", "3.3")]
-  [PluginDependency("HeuristicLab.Data", "3.3")]
   [PluginDependency("HeuristicLab.MainForm", "3.3")]
   [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]

branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/HeuristicLabAnalysisFitnessLandscapePlugin.cs.frame

@@ -34 +34 @@
   [PluginDependency("HeuristicLab.Data", "3.3")]
   [PluginDependency("HeuristicLab.Encodings.BinaryVectorEncoding", "3.3")]
-  [PluginDependency("HeuristicLab.Encodings.IntegerVectorEncoding", "3.3")]
   [PluginDependency("HeuristicLab.Encodings.PermutationEncoding", "3.3")]
   [PluginDependency("HeuristicLab.Encodings.RealVectorEncoding", "3.3")]

branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK.Views/HeuristicLabProblemsNKViewsPlugin.cs.frame

@@ -26 +26 @@
   [Plugin("HeuristicLab.Problems.NK.Views", "3.3.0.$WCREV$")]
   [PluginFile("HeuristicLab.Problems.NK.Views-3.3.dll", PluginFileType.Assembly)]
-  [PluginDependency("HeuristicLab.Common", "3.3")]
   [PluginDependency("HeuristicLab.Core", "3.3")]  
   [PluginDependency("HeuristicLab.Core.Views", "3.3")]  

branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK/BinaryVectorComparers/AverageBitBinaryVectorComparer.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Linq;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
-using HeuristicLab.Common;
+using HeuristicLab.Encodings.BinaryVectorEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Encodings.BinaryVectorEncoding;
 
 namespace HeuristicLab.Problems.NK {
-  
+
   [Item("Average Bit Binary Vector Comparer", "Compares two binary vectors by their average positive bit location")]
   [StorableClass]
   public sealed class AverageBitBinaryVectorComparer : BinaryVectorComparer {
-    
+
     [StorableConstructor]
-    protected AverageBitBinaryVectorComparer(bool deserializing) : base(deserializing) { }
-    protected AverageBitBinaryVectorComparer(AverageBitBinaryVectorComparer original, Cloner cloner)
+    private AverageBitBinaryVectorComparer(bool deserializing) : base(deserializing) { }
+    private AverageBitBinaryVectorComparer(AverageBitBinaryVectorComparer original, Cloner cloner)
       : base(original, cloner) {
     }
@@ -25 +21 @@
     }
 
-    public static double AverageBit(BinaryVector x) {      
+    public static double AverageBit(BinaryVector x) {
       return x.Select((b, i) => new { b, i }).Where(v => v.b).Average(v => v.i);
     }
 
     public override int Compare(BinaryVector x, BinaryVector y) {
-      return (AverageBit(x) - AverageBit(y)).CompareTo(0);      
-    }    
-  } 
+      return (AverageBit(x) - AverageBit(y)).CompareTo(0);
+    }
+  }
 }

branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK/BinaryVectorComparers/LexicographicBinaryVectorComparer.cs

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
-using HeuristicLab.Common;
+using HeuristicLab.Encodings.BinaryVectorEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Encodings.BinaryVectorEncoding;
 
 namespace HeuristicLab.Problems.NK {
-    
+
   [Item("Lexicographic Binary Vector Comparer", "Compares two binary vectors lexicographically")]
   [StorableClass]
@@ -16 +12 @@
 
     [StorableConstructor]
-    protected LexicographicBinaryVectorComparer(bool deserializing) : base(deserializing) { }
-    protected LexicographicBinaryVectorComparer(LexicographicBinaryVectorComparer original, Cloner cloner)
+    private LexicographicBinaryVectorComparer(bool deserializing) : base(deserializing) { }
+    private LexicographicBinaryVectorComparer(LexicographicBinaryVectorComparer original, Cloner cloner)
       : base(original, cloner) {
     }
@@ -26 +22 @@
 
     public override int Compare(BinaryVector x, BinaryVector y) {
-      for (int i = 0; i<Math.Min(x.Length, y.Length); i++) {
+      for (int i = 0; i < Math.Min(x.Length, y.Length); i++) {
         if (!x[i] && y[i])
           return -1;

branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK/BinaryVectorComparers/MedianBitBinaryVectorComparer.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Linq;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
-using HeuristicLab.Common;
+using HeuristicLab.Encodings.BinaryVectorEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Encodings.BinaryVectorEncoding;
 
 namespace HeuristicLab.Problems.NK {
@@ -16 +12 @@
 
     [StorableConstructor]
-    protected MedianBitBinaryVectorComparer(bool deserializing) : base(deserializing) { }
-    protected MedianBitBinaryVectorComparer(MedianBitBinaryVectorComparer original, Cloner cloner)
+    private MedianBitBinaryVectorComparer(bool deserializing) : base(deserializing) { }
+    private MedianBitBinaryVectorComparer(MedianBitBinaryVectorComparer original, Cloner cloner)
       : base(original, cloner) {
     }
@@ -26 +22 @@
 
     public static int MedianBit(BinaryVector x) {
-      var activeIndices = x.Select((b, i) => new { b, i }).Where(v => v.b).ToList();      
-      if (activeIndices.Count > 0)        
-        return activeIndices[activeIndices.Count/2].i;
+      var activeIndices = x.Select((b, i) => new { b, i }).Where(v => v.b).ToList();
+      if (activeIndices.Count > 0)
+        return activeIndices[activeIndices.Count / 2].i;
       else
         return 0;
@@ -35 +31 @@
       return MedianBit(x) - MedianBit(y);
     }
-  }  
+  }
 }

branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK/HeuristicLab.Problems.NK.csproj

@@ -107 +107 @@
     <Reference Include="HeuristicLab.Common-3.3">
       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
-    </Reference>
-    <Reference Include="HeuristicLab.Common.Resources-3.3">
-      <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     </Reference>
     <Reference Include="HeuristicLab.Core-3.3">

branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK/HeuristicLabProblemsNKPlugin.cs.frame

@@ -28 +28 @@
   [PluginDependency("HeuristicLab.Collections", "3.3")]
   [PluginDependency("HeuristicLab.Common", "3.3")]
-  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]  
   [PluginDependency("HeuristicLab.Core", "3.3")]  
   [PluginDependency("HeuristicLab.Data", "3.3")]

branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK/NKLandscape.cs

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
 using HeuristicLab.Common;
-using HeuristicLab.Common.Resources;
 using HeuristicLab.Core;
 using HeuristicLab.Data;