Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
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:
3 added
3 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers-3.3.csproj

    r10114 r10116  
    9191      <Private>False</Private>
    9292    </Reference>
     93    <Reference Include="HeuristicLab.Problems.TravelingSalesman-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     94      <SpecificVersion>False</SpecificVersion>
     95      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.TravelingSalesman-3.3.dll</HintPath>
     96      <Private>False</Private>
     97    </Reference>
    9398    <Reference Include="System" />
    9499    <Reference Include="System.Core" />
     
    104109    <Compile Include="RealVectorConvexHullSolutionCacheAnalyzer.cs" />
    105110    <Compile Include="DistanceMatrixToPoints.cs" />
     111    <Compile Include="RunCollectionModifiers\PermutationConvexHullModifier.cs" />
     112    <Compile Include="RunCollectionModifiers\RealVectorConvexHullModifier.cs" />
    106113    <Compile Include="VertexComparer.cs" />
    107114    <Compile Include="CombinedOperator.cs" />
  • branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/Plugin.cs.frame

    r9789 r10116  
    3131  [PluginDependency("HeuristicLab.Data", "3.3")]
    3232  [PluginDependency("HeuristicLab.Encodings.PermutationEncoding", "3.3")]
     33  [PluginDependency("HeuristicLab.Encodings.RealVectorEncoding", "3.3")]
     34  [PluginDependency("HeuristicLab.Problems.TravelingSalesman", "3.3")]
    3335  [PluginDependency("HeuristicLab.Operators", "3.3")]
    3436  [PluginDependency("HeuristicLab.Optimization", "3.3")]
  • branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/RealVectorConvexHullSolutionCacheAnalyzer.cs

    r10090 r10116  
    5454
    5555      while (sols.Count != 0) {
    56         var input = sols.Select(x => ConvertPermutationToVertex(x)).ToArray();
     56        var input = sols.Select(x => ConvertRealVectorToArray(x)).ToArray();
    5757        var convexHull = LPHull.Calculate(input);
    5858        var volume = ConvexHullMeasures.CalculateVolume(convexHull);
     
    6666    }
    6767
    68     private double[] ConvertPermutationToVertex(RealVector p) {
     68    private double[] ConvertRealVectorToArray(RealVector p) {
    6969      double[] vertex = p.Select(x => (double)x).ToArray();
    7070      return vertex;
Note: See TracChangeset for help on using the changeset viewer.