Changeset 9053

Timestamp:

12/13/12 16:52:40 (11 years ago)

Author:

ascheibe

Message:

#1886 added a dialog for adding operators as successors to other operators

Location:

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

Files:

• AfterCrossoverCombinedOperator.cs (modified) (1 diff)
• AfterMutationCombinedOperator.cs (modified) (1 diff)
• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers-3.3.csproj (modified) (3 diffs)
• Plugin.cs.frame (modified) (1 diff)
• Views (added)
• Views/SuccessorConfigurator.Designer.cs (added)
• Views/SuccessorConfigurator.cs (added)
• Views/SuccessorConfiguratorMenuItem.cs (added)

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

@@ -48 +48 @@
     protected AfterCrossoverCombinedOperator(AfterCrossoverCombinedOperator original, Cloner cloner)
       : base(original, cloner) {
-      cxAnalyzer = (CrossoverPerformanceAnalyzer)original.cxAnalyzer.Clone(cloner);
-      varDuplicator = (VariableDuplicator)original.cxAnalyzer.Clone(cloner);
+      cxAnalyzer = original.cxAnalyzer != null ? (CrossoverPerformanceAnalyzer)original.cxAnalyzer.Clone(cloner) : null;
+      varDuplicator = original.varDuplicator != null ? (VariableDuplicator)original.cxAnalyzer.Clone(cloner) : null;
     }
 

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

@@ -49 +49 @@
     protected AfterMutationCombinedOperator(AfterMutationCombinedOperator original, Cloner cloner)
       : base(original, cloner) {
-      this.mAnalyzer = (MutationPerformanceAnalyzer)original.mAnalyzer.Clone(cloner);
-      this.varRemover = (VariableRemover)original.varRemover.Clone(cloner);
+      this.mAnalyzer = original.mAnalyzer != null ? (MutationPerformanceAnalyzer)original.mAnalyzer.Clone(cloner) : null;
+      this.varRemover = original.varRemover != null ? (VariableRemover)original.varRemover.Clone(cloner) : null;
     }
 

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.Optimizer-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimizer-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="HeuristicLab.Parameters-3.3">
       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
@@ -148 +153 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="VariableDuplicator.cs" />
+    <Compile Include="Views\SuccessorConfigurator.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Views\SuccessorConfigurator.Designer.cs">
+      <DependentUpon>SuccessorConfigurator.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Views\SuccessorConfiguratorMenuItem.cs" />
     <Compile Include="WeightedParentsQualityComparer.cs" />
   </ItemGroup>
@@ -155 +167 @@
     <None Include="Properties\AssemblyInfo.cs.frame" />
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

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

@@ -37 +37 @@
   [PluginDependency("HeuristicLab.Persistence", "3.3")]
   [PluginDependency("HeuristicLab.Problems.TravelingSalesman", "3.3")]
+  [PluginDependency("HeuristicLab.Optimizer", "3.3")]
   public class HeuristicLabAnalysisAlgorithmBehaviorAnalyzersPlugin : PluginBase {
   }