Free cookie consent management tool by TermsFeed Policy Generator

Changeset 10090


Ignore:
Timestamp:
10/28/13 17:51:43 (11 years ago)
Author:
ascheibe
Message:

#1886 added an algorithm that executes analyzers on a solution cache

Location:
branches/HeuristicLab.Analysis.AlgorithmBehavior
Files:
7 added
4 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.Analysis.AlgorithmBehavior/AlgorithmBehaviorUnitTests/AlgorithmBehaviorUnitTests.csproj

    r10060 r10090  
    4747    <Reference Include="HeuristicLab.Encodings.PermutationEncoding-3.3">
    4848      <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Encodings.PermutationEncoding-3.3.dll</HintPath>
     49    </Reference>
     50    <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     51      <SpecificVersion>False</SpecificVersion>
     52      <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
    4953    </Reference>
    5054    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">

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

    r10060 r10090  
    7272      <Private>False</Private>
    7373    </Reference>
     74    <Reference Include="HeuristicLab.Encodings.RealVectorEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     75      <SpecificVersion>False</SpecificVersion>
     76      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.RealVectorEncoding-3.3.dll</HintPath>
     77      <Private>False</Private>
     78    </Reference>
    7479    <Reference Include="HeuristicLab.Operators-3.3">
    7580      <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
    … …  
    118123  </ItemGroup>
    119124  <ItemGroup>
     125    <Compile Include="RealVectorConvexHullSolutionCacheAnalyzer.cs" />
    120126    <Compile Include="DistanceMatrixToPoints.cs" />
    121127    <Compile Include="VertexComparer.cs" />
    … …  
    161167    <None Include="Properties\AssemblyInfo.cs.frame" />
    162168  </ItemGroup>
     169  <ItemGroup>
     170    <ProjectReference Include="..\..\HeuristicLab.Analysis.SolutionCaching\3.3\HeuristicLab.Analysis.SolutionCaching-3.3.csproj">
     171      <Project>{a05aa272-14ec-4422-ac70-c9ca42164441}</Project>
     172      <Name>HeuristicLab.Analysis.SolutionCaching-3.3</Name>
     173      <Private>False</Private>
     174    </ProjectReference>
     175  </ItemGroup>
    163176  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    164177  <PropertyGroup>

  • branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.SolutionCaching/3.3/HeuristicLab.Analysis.SolutionCaching-3.3.csproj

    r10025 r10090  
    123123  </ItemGroup>
    124124  <ItemGroup>
     125    <Compile Include="Algorithm\ISolutionCacheAnalyzer.cs" />
     126    <Compile Include="Algorithm\SolutionCacheAnalyzer.cs" />
     127    <Compile Include="Algorithm\SolutionCacheAnalyzerAlgorithm.cs" />
     128    <Compile Include="Algorithm\ParallelOperatorProcessor.cs" />
     129    <Compile Include="ISolutionCache.cs" />
    125130    <Compile Include="PermutationEncoding\PermutationSolutionCache.cs" />
    126131    <Compile Include="PermutationEncoding\PermutationSolutionCachingAnalyzer.cs" />

  • branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.SolutionCaching/3.3/SolutionCache.cs

    r10026 r10090  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
     26using HeuristicLab.Optimization;
    2627using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    27 using HeuristicLab.PluginInfrastructure;
    2828
    2929namespace HeuristicLab.Analysis.SolutionCaching {
    3030  [Item("SolutionCache", "Stores solutions generated by an algorithm.")]
    3131  [StorableClass]
    32   [NonDiscoverableType]
    33   public abstract class SolutionCache<TKey, TValue> : Item
     32  public abstract class SolutionCache<TKey, TValue> : Problem, ISolutionCache
    3433    where TKey : Item
    3534    where TValue : SolutionInformation<TKey> {
     35
     36    #region IStorableContent Members
     37    public string Filename { get; set; }
     38    #endregion
    3639
    3740    [Storable]
    … …  
    5255      InitializeSolutionDictionary();
    5356
    54       foreach (KeyValuePair<TKey, List<TValue>> keyValuePair in solutionDictionary) {
     57      foreach (KeyValuePair<TKey, List<TValue>> keyValuePair in original.solutionDictionary) {
    5558        List<TValue> lst = new List<TValue>();
    5659        foreach (TValue value in keyValuePair.Value) {
Note: See TracChangeset for help on using the changeset viewer.