Changeset 12809 for branches/TerminationCriteria/HeuristicLab.Optimization/3.3

Timestamp:

07/29/15 13:07:08 (9 years ago)

Author:

pfleck

Message:

#2027 Merged trunk changes.

Location:

branches/TerminationCriteria/HeuristicLab.Optimization

Files:

• . (modified) (1 prop)
• 3.3/BasicProblems/Operators/MultiObjectiveEvaluator.cs (modified) (2 diffs)
• 3.3/BasicProblems/Operators/SingleObjectiveEvaluator.cs (modified) (2 diffs)
• 3.3/HeuristicLab.Optimization-3.3.csproj (modified) (1 diff)
• 3.3/MetaOptimizers/TimeLimitRun.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization/3.3/MetaOptimizers/TimeLimitRun.cs)
• 3.3/Plugin.cs.frame (modified) (1 diff)
• 3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs (modified) (1 prop)
• 3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)
• 3.3/RunCollection.cs (modified) (6 diffs)

branches/TerminationCriteria/HeuristicLab.Optimization/3.3/BasicProblems/Operators/MultiObjectiveEvaluator.cs

@@ -31 +31 @@
   [Item("Multi-objective Evaluator", "Calls the Evaluate method of the problem definition and writes the return value into the scope.")]
   [StorableClass]
-  public class MultiObjectiveEvaluator : SingleSuccessorOperator, IMultiObjectiveEvaluationOperator, IStochasticOperator {
+  public class MultiObjectiveEvaluator : InstrumentedOperator, IMultiObjectiveEvaluationOperator, IStochasticOperator {
 
     public ILookupParameter<IRandom> RandomParameter {
@@ -60 +60 @@
     }
 
-    public override IOperation Apply() {
+    public override IOperation InstrumentedApply() {
       var random = RandomParameter.ActualValue;
       var encoding = EncodingParameter.ActualValue;
       var individual = encoding.GetIndividual(ExecutionContext.Scope);
       QualitiesParameter.ActualValue = new DoubleArray(EvaluateFunc(individual, random));
-      return base.Apply();
+      return base.InstrumentedApply();
     }
   }

branches/TerminationCriteria/HeuristicLab.Optimization/3.3/BasicProblems/Operators/SingleObjectiveEvaluator.cs

@@ -31 +31 @@
   [Item("Single-objective Evaluator", "Calls the script's Evaluate method to get the quality value of the parameter vector.")]
   [StorableClass]
-  public sealed class SingleObjectiveEvaluator : SingleSuccessorOperator, ISingleObjectiveEvaluationOperator, IStochasticOperator {
+  public sealed class SingleObjectiveEvaluator : InstrumentedOperator, ISingleObjectiveEvaluationOperator, IStochasticOperator {
 
     public ILookupParameter<IRandom> RandomParameter {
@@ -58 +58 @@
     public override IDeepCloneable Clone(Cloner cloner) { return new SingleObjectiveEvaluator(this, cloner); }
 
-    public override IOperation Apply() {
+    public override IOperation InstrumentedApply() {
       var random = RandomParameter.ActualValue;
       var encoding = EncodingParameter.ActualValue;
       var individual = encoding.GetIndividual(ExecutionContext.Scope);
       QualityParameter.ActualValue = new DoubleValue(EvaluateFunc(individual, random));
-      return base.Apply();
+      return base.InstrumentedApply();
     }
   }

branches/TerminationCriteria/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

@@ -194 +194 @@
     <Compile Include="MetaOptimizers\BatchRun.cs" />
     <Compile Include="MetaOptimizers\Experiment.cs" />
+    <Compile Include="MetaOptimizers\TimeLimitRun.cs" />
     <Compile Include="RunCollectionModification\RunCollectionRunRemover.cs" />
     <Compile Include="Plugin.cs" />

branches/TerminationCriteria/HeuristicLab.Optimization/3.3/Plugin.cs.frame

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

branches/TerminationCriteria/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.11.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.12.$WCREV$")]

branches/TerminationCriteria/HeuristicLab.Optimization/3.3/RunCollection.cs

@@ -445 +445 @@
       EventHandler<EventArgs<int, int>> handler = ItemChanged;
       if (handler != null) handler(this, new EventArgs<int, int>(rowIndex, columnIndex));
-      OnToStringChanged();
     }
     public event EventHandler Reset;
@@ -451 +450 @@
       EventHandler handler = Reset;
       if (handler != null) handler(this, EventArgs.Empty);
-      OnToStringChanged();
     }
     public event EventHandler ColumnsChanged;
@@ -485 +483 @@
     #region Filtering
     private void UpdateFiltering(bool reset) {
+      var oldUpateRuns = UpdateOfRunsInProgress;
       UpdateOfRunsInProgress = true;
       if (reset)
@@ -490 +489 @@
       foreach (IRunCollectionConstraint constraint in this.constraints)
         constraint.Check();
-      UpdateOfRunsInProgress = false;
+      UpdateOfRunsInProgress = oldUpateRuns;
     }
 
@@ -552 +551 @@
     #region Modification
     public void Modify() {
+      var oldUpateRuns = UpdateOfRunsInProgress;
       UpdateOfRunsInProgress = true;
       var runs = this.ToList();
@@ -566 +566 @@
         }
       }
-      UpdateOfRunsInProgress = false;
+      UpdateOfRunsInProgress = oldUpateRuns;
     }