Changeset 15719 for branches/1614_GeneralizedQAP/HeuristicLab.Optimization

Timestamp:

02/04/18 21:31:38 (7 years ago)

Author:

abeham

Message:

#1614:

• branched analysis and analysis views
• merged changes from #2457 into optimization and optimization.views

Location:

branches/1614_GeneralizedQAP/HeuristicLab.Optimization

Files:

• . (modified) (1 prop)
• 3.3 (modified) (1 prop)
• 3.3/Algorithms/Algorithm.cs (modified) (1 diff)
• 3.3/Algorithms/EngineAlgorithm.cs (modified) (1 diff)
• 3.3/HeuristicLab.Optimization-3.3.csproj (modified) (3 diffs)
• 3.3/Interfaces/IPreexistingSolutionCreator.cs (copied) (copied from branches/2457_ExpertSystem/HeuristicLab.Optimization/3.3/Interfaces/IPreexistingSolutionCreator.cs)
• 3.3/Interfaces/ISolutionModel.cs (copied) (copied from branches/2457_ExpertSystem/HeuristicLab.Optimization/3.3/Interfaces/ISolutionModel.cs)
• 3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs (modified) (1 prop)
• 3.3/Results/ResultParameter.cs (modified) (1 diff)

branches/1614_GeneralizedQAP/HeuristicLab.Optimization/3.3

@@ -5 +5 @@
 *.vs10x
 Plugin.cs
+*.DotSettings

@@ -5 +5 @@
 *.vs10x
 Plugin.cs
+*.DotSettings

branches/1614_GeneralizedQAP/HeuristicLab.Optimization/3.3/Algorithms/Algorithm.cs

@@ -221 +221 @@
     }
     public virtual void CollectResultValues(IDictionary<string, IItem> values) {
-      values.Add("Execution Time", new TimeSpanValue(ExecutionTime));
+      if (!Results.ContainsKey("Execution Time"))
+        values.Add("Execution Time", new TimeSpanValue(ExecutionTime));
       Results.CollectResultValues(values);
     }

branches/1614_GeneralizedQAP/HeuristicLab.Optimization/3.3/Algorithms/EngineAlgorithm.cs

@@ -170 +170 @@
         context = new ExecutionContext(context, operatorGraph.InitialOperator, globalScope);
         engine.Prepare(context);
+        engine.Log.Clear();
       }
     }

branches/1614_GeneralizedQAP/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

@@ -158 +158 @@
     <Compile Include="Interfaces\IPopulationReducer.cs" />
     <Compile Include="MultiObjective\DominationCalculator.cs" />
+    <Compile Include="Interfaces\IPreexistingSolutionCreator.cs" />
+    <Compile Include="Interfaces\ISolutionModel.cs" />
     <Compile Include="Results\IResultParameter.cs" />
     <Compile Include="Interfaces\ISingleObjectiveOperator.cs" />
@@ -173 +175 @@
     <Compile Include="MetaOptimizers\TimeLimitRun.cs" />
     <Compile Include="Results\ResultParameter.cs" />
+    <Compile Include="RunCollection.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="RunCollectionModification\RunCollectionRunRemover.cs" />
     <Compile Include="Plugin.cs" />
@@ -230 +235 @@
     <Compile Include="OptimizerList.cs" />
     <Compile Include="Interfaces\IOptimizer.cs" />
-    <Compile Include="RunCollection.cs" />
     <Compile Include="Run.cs" />
     <Compile Include="Results\IResult.cs" />

branches/1614_GeneralizedQAP/HeuristicLab.Optimization/3.3/Results/ResultParameter.cs

@@ -40 +40 @@
       get { return resultCollectionName; }
       set {
+        if (value == null) throw new ArgumentNullException();
         if (string.IsNullOrWhiteSpace(value)) throw new ArgumentNullException();
         else if (!value.Equals(resultCollectionName)) {

@@ -5 +5 @@
 *.vs10x
 Plugin.cs
+*.DotSettings