Changeset 10090 for branches

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:

• AlgorithmBehaviorUnitTests/AlgorithmBehaviorUnitTests.csproj (modified) (1 diff)
• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/RealVectorConvexHullSolutionCacheAnalyzer.cs (added)
• HeuristicLab.Analysis.SolutionCaching/3.3/Algorithm (added)
• HeuristicLab.Analysis.SolutionCaching/3.3/Algorithm/ISolutionCacheAnalyzer.cs (added)
• HeuristicLab.Analysis.SolutionCaching/3.3/Algorithm/ParallelOperatorProcessor.cs (added)
• HeuristicLab.Analysis.SolutionCaching/3.3/Algorithm/SolutionCacheAnalyzer.cs (added)
• HeuristicLab.Analysis.SolutionCaching/3.3/Algorithm/SolutionCacheAnalyzerAlgorithm.cs (added)
• HeuristicLab.Analysis.SolutionCaching/3.3/HeuristicLab.Analysis.SolutionCaching-3.3.csproj (modified) (1 diff)
• HeuristicLab.Analysis.SolutionCaching/3.3/ISolutionCache.cs (added)
• HeuristicLab.Analysis.SolutionCaching/3.3/SolutionCache.cs (modified) (2 diffs)

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

@@ -47 +47 @@
     <Reference Include="HeuristicLab.Encodings.PermutationEncoding-3.3">
       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Encodings.PermutationEncoding-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
     </Reference>
     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">

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

@@ -72 +72 @@
       <Private>False</Private>
     </Reference>
+    <Reference Include="HeuristicLab.Encodings.RealVectorEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.RealVectorEncoding-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="HeuristicLab.Operators-3.3">
       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
@@ -118 +123 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="RealVectorConvexHullSolutionCacheAnalyzer.cs" />
     <Compile Include="DistanceMatrixToPoints.cs" />
     <Compile Include="VertexComparer.cs" />
@@ -161 +167 @@
     <None Include="Properties\AssemblyInfo.cs.frame" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Analysis.SolutionCaching\3.3\HeuristicLab.Analysis.SolutionCaching-3.3.csproj">
+      <Project>{a05aa272-14ec-4422-ac70-c9ca42164441}</Project>
+      <Name>HeuristicLab.Analysis.SolutionCaching-3.3</Name>
+      <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

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

@@ -123 +123 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Algorithm\ISolutionCacheAnalyzer.cs" />
+    <Compile Include="Algorithm\SolutionCacheAnalyzer.cs" />
+    <Compile Include="Algorithm\SolutionCacheAnalyzerAlgorithm.cs" />
+    <Compile Include="Algorithm\ParallelOperatorProcessor.cs" />
+    <Compile Include="ISolutionCache.cs" />
     <Compile Include="PermutationEncoding\PermutationSolutionCache.cs" />
     <Compile Include="PermutationEncoding\PermutationSolutionCachingAnalyzer.cs" />

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

@@ -24 +24 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Analysis.SolutionCaching {
   [Item("SolutionCache", "Stores solutions generated by an algorithm.")]
   [StorableClass]
-  [NonDiscoverableType]
-  public abstract class SolutionCache<TKey, TValue> : Item
+  public abstract class SolutionCache<TKey, TValue> : Problem, ISolutionCache
     where TKey : Item
     where TValue : SolutionInformation<TKey> {
+
+    #region IStorableContent Members
+    public string Filename { get; set; }
+    #endregion
 
     [Storable]
@@ -52 +55 @@
       InitializeSolutionDictionary();
 
-      foreach (KeyValuePair<TKey, List<TValue>> keyValuePair in solutionDictionary) {
+      foreach (KeyValuePair<TKey, List<TValue>> keyValuePair in original.solutionDictionary) {
         List<TValue> lst = new List<TValue>();
         foreach (TValue value in keyValuePair.Value) {