Changeset 14029 for branches/crossvalidation-2434/HeuristicLab.Optimization

Timestamp:

07/08/16 14:40:02 (9 years ago)

Author:

gkronber

Message:

#2434: merged trunk changes r12934:14026 from trunk to branch

Location:

branches/crossvalidation-2434

Files:

• . (modified) (1 prop)
• HeuristicLab.Optimization (modified) (1 prop)
• HeuristicLab.Optimization/3.3/BasicProblems/Encoding.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Optimization/3.3/Interfaces/ICharacteristicCalculator.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization/3.3/Interfaces/ICharacteristicCalculator.cs)
• HeuristicLab.Optimization/3.3/Interfaces/ISolutionSimilarityCalculator.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/ITerminationBasedOperator.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization/3.3/Interfaces/ITerminationBasedOperator.cs)
• HeuristicLab.Optimization/3.3/Interfaces/ITerminator.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization/3.3/Interfaces/ITerminator.cs)
• HeuristicLab.Optimization/3.3/MetaOptimizers/TimeLimitRun.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs (modified) (1 prop)
• HeuristicLab.Optimization/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)
• HeuristicLab.Optimization/3.3/RunCollection.cs (modified) (4 diffs)
• HeuristicLab.Optimization/3.3/Termination (copied) (copied from trunk/sources/HeuristicLab.Optimization/3.3/Termination)

branches/crossvalidation-2434/HeuristicLab.Optimization/3.3/BasicProblems/Encoding.cs

@@ -67 +67 @@
       }
     }
+    [Storable]
     private T solutionCreator;
     public T SolutionCreator {

branches/crossvalidation-2434/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

@@ -153 +153 @@
     <Compile Include="BasicProblems\Operators\SingleObjectiveMoveMaker.cs" />
     <Compile Include="BasicProblems\SingleObjectiveBasicProblem.cs" />
+    <Compile Include="Interfaces\ICharacteristicCalculator.cs" />
     <Compile Include="Interfaces\ILocalImprovementAlgorithmOperator.cs" />
     <Compile Include="Interfaces\IMultiObjectiveOperator.cs" />
@@ -163 +164 @@
     <Compile Include="Interfaces\ISimilarityBasedOperator.cs" />
     <Compile Include="Interfaces\ISolutionSimilarityCalculator.cs" />
+    <Compile Include="Interfaces\ITerminationBasedOperator.cs" />
+    <Compile Include="Interfaces\ITerminator.cs" />
     <Compile Include="MetaOptimizers\BatchRun.cs" />
     <Compile Include="MetaOptimizers\Experiment.cs" />
@@ -173 +176 @@
     <Compile Include="RunCollectionModification\RunCollectionValueRemover.cs" />
     <Compile Include="Interfaces\IRunCollectionModifier.cs" />
+    <Compile Include="Termination\ComparisonTerminator.cs" />
+    <Compile Include="Termination\ExecutionTimeTerminator.cs" />
+    <Compile Include="Termination\MultiTerminator.cs" />
+    <Compile Include="Termination\SingleObjectiveQualityTerminator.cs" />
+    <Compile Include="Termination\TerminationOperator.cs" />
+    <Compile Include="Termination\Terminator.cs" />
+    <Compile Include="Termination\ThresholdTerminator.cs" />
     <None Include="Plugin.cs.frame" />
     <Compile Include="Algorithms\Algorithm.cs" />

branches/crossvalidation-2434/HeuristicLab.Optimization/3.3/Interfaces/ISolutionSimilarityCalculator.cs

@@ -30 +30 @@
     string SolutionVariableName { get; set; }
     string QualityVariableName { get; set; }
+    bool ExecuteInParallel { get; set; }
+    int MaxDegreeOfParallelism { get; set; }
 
     /// <summary>

branches/crossvalidation-2434/HeuristicLab.Optimization/3.3/MetaOptimizers/TimeLimitRun.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/crossvalidation-2434/HeuristicLab.Optimization/3.3/Plugin.cs.frame

@@ -26 +26 @@
   /// Plugin class for HeuristicLab.Optimization plugin.
   /// </summary>
-  [Plugin("HeuristicLab.Optimization", "3.3.12.$WCREV$")]
+  [Plugin("HeuristicLab.Optimization", "3.3.13.$WCREV$")]
   [PluginFile("HeuristicLab.Optimization-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Collections", "3.3")]

branches/crossvalidation-2434/HeuristicLab.Optimization/3.3/Properties/AssemblyInfo.cs.frame

@@ -54 +54 @@
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.12.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.13.$WCREV$")]

branches/crossvalidation-2434/HeuristicLab.Optimization/3.3/RunCollection.cs

@@ -483 +483 @@
     #region Filtering
     private void UpdateFiltering(bool reset) {
-      var oldUpateRuns = UpdateOfRunsInProgress;
-      UpdateOfRunsInProgress = true;
       if (reset)
         list.ForEach(r => r.Visible = true);
       foreach (IRunCollectionConstraint constraint in this.constraints)
         constraint.Check();
-      UpdateOfRunsInProgress = oldUpateRuns;
     }
 
@@ -539 +536 @@
     protected virtual void Constraint_ConstraintOperationChanged(object sender, EventArgs e) {
       IRunCollectionConstraint constraint = (IRunCollectionConstraint)sender;
-      if (constraint.Active)
-        this.UpdateFiltering(true);
+      if (constraint.Active) {
+        var oldUpdateRuns = UpdateOfRunsInProgress;
+        try {
+          UpdateOfRunsInProgress = true;
+          UpdateFiltering(true);
+        } finally { UpdateOfRunsInProgress = oldUpdateRuns; }
+      }
     }
     protected virtual void Constraint_ConstraintDataChanged(object sender, EventArgs e) {
       IRunCollectionConstraint constraint = (IRunCollectionConstraint)sender;
-      if (constraint.Active)
-        this.UpdateFiltering(true);
+      if (constraint.Active) {
+        var oldUpdateRuns = UpdateOfRunsInProgress;
+        try {
+          UpdateOfRunsInProgress = true;
+          UpdateFiltering(true);
+        } finally { UpdateOfRunsInProgress = oldUpdateRuns; }
+      }
     }
     #endregion
@@ -551 +558 @@
     #region Modification
     public void Modify() {
-      var oldUpateRuns = UpdateOfRunsInProgress;
-      UpdateOfRunsInProgress = true;
       var runs = this.ToList();
       var selectedRuns = runs.Where(r => r.Visible).ToList();
@@ -566 +571 @@
         }
       }
-      UpdateOfRunsInProgress = oldUpateRuns;
     }