Changeset 10116 for branches

Timestamp:

11/08/13 11:48:18 (11 years ago)

Author:

ascheibe

Message:

#1886 added convex hull RunCollectionModifiers

Location:

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3

Files:

• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers-3.3.csproj (modified) (2 diffs)
• Plugin.cs.frame (modified) (1 diff)
• RealVectorConvexHullSolutionCacheAnalyzer.cs (modified) (2 diffs)
• RunCollectionModifiers (added)
• RunCollectionModifiers/PermutationConvexHullModifier.cs (added)
• RunCollectionModifiers/RealVectorConvexHullModifier.cs (added)

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers-3.3.csproj

@@ -91 +91 @@
       <Private>False</Private>
     </Reference>
+    <Reference Include="HeuristicLab.Problems.TravelingSalesman-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.TravelingSalesman-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -104 +109 @@
     <Compile Include="RealVectorConvexHullSolutionCacheAnalyzer.cs" />
     <Compile Include="DistanceMatrixToPoints.cs" />
+    <Compile Include="RunCollectionModifiers\PermutationConvexHullModifier.cs" />
+    <Compile Include="RunCollectionModifiers\RealVectorConvexHullModifier.cs" />
     <Compile Include="VertexComparer.cs" />
     <Compile Include="CombinedOperator.cs" />

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/Plugin.cs.frame

@@ -31 +31 @@
   [PluginDependency("HeuristicLab.Data", "3.3")]
   [PluginDependency("HeuristicLab.Encodings.PermutationEncoding", "3.3")]
+  [PluginDependency("HeuristicLab.Encodings.RealVectorEncoding", "3.3")]
+  [PluginDependency("HeuristicLab.Problems.TravelingSalesman", "3.3")]
   [PluginDependency("HeuristicLab.Operators", "3.3")]
   [PluginDependency("HeuristicLab.Optimization", "3.3")]

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/RealVectorConvexHullSolutionCacheAnalyzer.cs

@@ -54 +54 @@
 
       while (sols.Count != 0) {
-        var input = sols.Select(x => ConvertPermutationToVertex(x)).ToArray();
+        var input = sols.Select(x => ConvertRealVectorToArray(x)).ToArray();
         var convexHull = LPHull.Calculate(input);
         var volume = ConvexHullMeasures.CalculateVolume(convexHull);
@@ -66 +66 @@
     }
 
-    private double[] ConvertPermutationToVertex(RealVector p) {
+    private double[] ConvertRealVectorToArray(RealVector p) {
       double[] vertex = p.Select(x => (double)x).ToArray();
       return vertex;