Changeset 8086 for branches/ScatterSearch (trunk integration)/HeuristicLab.DebugEngine

Timestamp:

06/22/12 11:11:38 (12 years ago)

Author:

jkarder

Message:

#1331:

• synced branch with trunk
• added custom interface (ISimilarityBasedOperator) to mark operators that conduct similarity calculation
• similarity calculators are now parameterized by the algorithm
• deleted SolutionPool2TierUpdateMethod
• deleted KnapsackMultipleGuidesPathRelinker
• moved IImprovementOperator, IPathRelinker and ISimilarityCalculator to HeuristicLab.Optimization
• added parameter descriptions
• fixed plugin references
• fixed count of EvaluatedSolutions
• fixed check for duplicate solutions
• minor code improvements

Location:

branches/ScatterSearch (trunk integration)

Files:

• . (modified) (2 props)
• HeuristicLab.DebugEngine/3.3/DebugEngineView.Designer.cs (deleted)
• HeuristicLab.DebugEngine/3.3/DebugEngineView.cs (deleted)
• HeuristicLab.DebugEngine/3.3/ExecutionStackView.Designer.cs (deleted)
• HeuristicLab.DebugEngine/3.3/ExecutionStackView.cs (deleted)
• HeuristicLab.DebugEngine/3.3/HeuristicLab.DebugEngine-3.3.csproj (modified) (2 diffs)
• HeuristicLab.DebugEngine/3.3/OperationContentView.Designer.cs (deleted)
• HeuristicLab.DebugEngine/3.3/OperationContentView.cs (deleted)
• HeuristicLab.DebugEngine/3.3/OperatorTraceView.Designer.cs (deleted)
• HeuristicLab.DebugEngine/3.3/OperatorTraceView.cs (deleted)
• HeuristicLab.DebugEngine/3.3/Plugin.cs.frame (modified) (1 diff)

branches/ScatterSearch (trunk integration)

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests

branches/ScatterSearch (trunk integration)/HeuristicLab.DebugEngine/3.3/HeuristicLab.DebugEngine-3.3.csproj

@@ -86 +86 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="OperatorTrace.cs" />
     <Compile Include="DebugEngine.cs" />
-    <Compile Include="DebugEngineView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="DebugEngineView.Designer.cs">
-      <DependentUpon>DebugEngineView.cs</DependentUpon>
-    </Compile>
     <Compile Include="ExecutionStack.cs" />
-    <Compile Include="ExecutionStackView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="ExecutionStackView.Designer.cs">
-      <DependentUpon>ExecutionStackView.cs</DependentUpon>
-    </Compile>
     <Compile Include="OperationChangedEventArgs.cs" />
     <Compile Include="OperationContent.cs" />
-    <Compile Include="OperationContentView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="OperationContentView.Designer.cs">
-      <DependentUpon>OperationContentView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="OperatorTraceView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="OperatorTraceView.Designer.cs">
-      <DependentUpon>OperatorTraceView.cs</DependentUpon>
-    </Compile>
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -147 +118 @@
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
-      <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
-      <Name>HeuristicLab.Core.Views-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
       <Name>HeuristicLab.Core-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
-      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
-      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
-      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
-      <Name>HeuristicLab.MainForm-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
-      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
-      <Name>HeuristicLab.Operators-3.3</Name>
       <Private>False</Private>
     </ProjectReference>

branches/ScatterSearch (trunk integration)/HeuristicLab.DebugEngine/3.3/Plugin.cs.frame

@@ -30 +30 @@
   [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
   [PluginDependency("HeuristicLab.Core", "3.3")]
-  [PluginDependency("HeuristicLab.Core.Views", "3.3")]
-  [PluginDependency("HeuristicLab.MainForm", "3.3")]
-  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
-  [PluginDependency("HeuristicLab.Operators", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]  
   public class HeuristicLabDebugEnginePlugin : PluginBase { }

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests