Changeset 14601 for branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization

Timestamp:

01/24/17 09:31:29 (8 years ago)

Author:

jkarder

Message:

#2205: worked on optimization networks

• created separate project for ttp optimization
• removed some unused classes

Location:

branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization/3.3

Files:

• ActionMessage.cs (deleted)
• HeuristicLab.Networks.IntegratedOptimization-3.3.csproj (modified) (1 diff)
• InitializeRequestMessage.cs (deleted)
• InitializeResponseMessage.cs (deleted)
• MessageAction.cs (deleted)
• OrchestratedAlgorithmNode.cs (modified) (1 diff)
• OrchestrationMessage.cs (moved) (moved from branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization/3.3/OrchestrationSystem.cs)
• Problems (deleted)
• SolveRequestMessage.cs (deleted)
• SolveResponseMessage.cs (deleted)
• Utils.cs (deleted)
• VariegationProblem.cs (copied) (copied from branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization/3.3/Problems/VariegationProblem.cs)

branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization/3.3/HeuristicLab.Networks.IntegratedOptimization-3.3.csproj

@@ -226 +226 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Problems\BinaryKnapsackProblem.cs" />
     <Compile Include="IOrchestratorNode.cs" />
     <Compile Include="OrchestratedAlgorithmNode.cs" />
-    <Compile Include="OrchestrationSystem.cs" />
+    <Compile Include="OrchestrationMessage.cs" />
     <Compile Include="OrchestratorNode.cs" />
-    <Compile Include="Problems\LootProfitProblem.cs" />
-    <Compile Include="Problems\TourProfitProblem.cs" />
-    <Compile Include="Problems\VariegationProblem.cs" />
-    <Compile Include="SolveResponseMessage.cs" />
-    <Compile Include="SolveRequestMessage.cs" />
-    <Compile Include="TtpImporter.cs" />
+    <Compile Include="VariegationProblem.cs" />
     <Compile Include="TtpNetwork.cs" />
     <Compile Include="TtpNetwork2.cs" />
-    <Compile Include="TtpNetwork3.cs" />
     <Compile Include="TtpNetwork4.cs" />
-    <Compile Include="TtpNetwork5.cs" />
-    <Compile Include="TtpOrchestratorNode3.cs" />
     <Compile Include="TtpOrchestratorNode1.cs" />
     <Compile Include="TtpOrchestratorNode2.cs" />
     <Compile Include="TtpOrchestratorNode4.cs" />
-    <Compile Include="TtpOrchestratorNode5.cs" />
-    <Compile Include="TtpUtils.cs" />
-    <Compile Include="Utils.cs" />
     <None Include="Plugin.cs.frame" />
     <None Include="Properties\AssemblyInfo.cs.frame" />
-    <Compile Include="ActionMessage.cs" />
-    <Compile Include="InitializeResponseMessage.cs" />
-    <Compile Include="InitializeRequestMessage.cs" />
-    <Compile Include="MessageAction.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization/3.3/OrchestratedAlgorithmNode.cs

@@ -108 +108 @@
                     foreach (var analyzer in multiAnalyzer.Operators) {
                       bool checkedState;
-                      checkedStates.TryGetValue(analyzer.GetType(), out checkedState);
+                      if (!checkedStates.TryGetValue(analyzer.GetType(), out checkedState))
+                        checkedState = analyzer.EnabledByDefault;
                       multiAnalyzer.Operators.SetItemCheckedState(analyzer, checkedState);
                     }