Changeset 15721 for branches/1614_GeneralizedQAP

Timestamp:

02/04/18 22:33:26 (7 years ago)

Author:

abeham

Message:

#1614:

• reverted r15603 by reverse merging
• added expert system plugins from #2457

Location:

branches/1614_GeneralizedQAP

Files:

• GeneralizedQAP.sln (modified) (2 diffs)
• HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj (modified) (1 diff)
• HeuristicLab.Analysis/3.3/Optimizers/IteratedAlgorithm.cs (copied) (copied from branches/2457_ExpertSystem/HeuristicLab.Analysis/3.3/Optimizers/IteratedAlgorithm.cs)
• HeuristicLab.Optimization.Views/3.3/IOptimizerView.Designer.cs (modified) (4 diffs)
• HeuristicLab.Optimization.Views/3.3/IOptimizerView.cs (modified) (9 diffs)
• HeuristicLab.Optimization/3.3/Algorithms/Algorithm.cs (modified) (10 diffs)
• HeuristicLab.Optimization/3.3/Algorithms/BasicAlgorithm.cs (modified) (7 diffs)
• HeuristicLab.Optimization/3.3/Algorithms/EngineAlgorithm.cs (modified) (4 diffs)
• HeuristicLab.Optimization/3.3/Algorithms/HeuristicOptimizationAlgorithm.cs (modified) (3 diffs)
• HeuristicLab.Optimization/3.3/MetaOptimizers/BatchRun.cs (modified) (13 diffs)
• HeuristicLab.Optimization/3.3/MetaOptimizers/Experiment.cs (modified) (5 diffs)
• HeuristicLab.Optimization/3.3/MetaOptimizers/TimeLimitRun.cs (modified) (9 diffs)
• HeuristicLab.OptimizationExpertSystem (copied) (copied from branches/2457_ExpertSystem/HeuristicLab.OptimizationExpertSystem)
• HeuristicLab.OptimizationExpertSystem.Common (copied) (copied from branches/2457_ExpertSystem/HeuristicLab.OptimizationExpertSystem.Common)
• HeuristicLab.OptimizationExpertSystem.Common/3.3/HeuristicLab.OptimizationExpertSystem.Common-3.3.csproj (modified) (1 diff)

branches/1614_GeneralizedQAP/GeneralizedQAP.sln

@@ -29 +29 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Analysis.Views-3.3", "HeuristicLab.Analysis.Views\3.3\HeuristicLab.Analysis.Views-3.3.csproj", "{76945D76-CA61-4147-9DC2-0ACDCDDF87F9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.OptimizationExpertSystem.Common-3.3", "HeuristicLab.OptimizationExpertSystem.Common\3.3\HeuristicLab.OptimizationExpertSystem.Common-3.3.csproj", "{492CC257-E27C-4497-B2C1-09C45310C91C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.OptimizationExpertSystem-3.3", "HeuristicLab.OptimizationExpertSystem\3.3\HeuristicLab.OptimizationExpertSystem-3.3.csproj", "{6240A044-BD4B-4DDB-9E67-A6CFA5E0C7BE}"
 EndProject
 Global
@@ -196 +200 @@
     {76945D76-CA61-4147-9DC2-0ACDCDDF87F9}.Release|x86.ActiveCfg = Release|x86
     {76945D76-CA61-4147-9DC2-0ACDCDDF87F9}.Release|x86.Build.0 = Release|x86
+    {492CC257-E27C-4497-B2C1-09C45310C91C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {492CC257-E27C-4497-B2C1-09C45310C91C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {492CC257-E27C-4497-B2C1-09C45310C91C}.Debug|x64.ActiveCfg = Debug|x64
+    {492CC257-E27C-4497-B2C1-09C45310C91C}.Debug|x64.Build.0 = Debug|x64
+    {492CC257-E27C-4497-B2C1-09C45310C91C}.Debug|x86.ActiveCfg = Debug|x86
+    {492CC257-E27C-4497-B2C1-09C45310C91C}.Debug|x86.Build.0 = Debug|x86
+    {492CC257-E27C-4497-B2C1-09C45310C91C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {492CC257-E27C-4497-B2C1-09C45310C91C}.Release|Any CPU.Build.0 = Release|Any CPU
+    {492CC257-E27C-4497-B2C1-09C45310C91C}.Release|x64.ActiveCfg = Release|x64
+    {492CC257-E27C-4497-B2C1-09C45310C91C}.Release|x64.Build.0 = Release|x64
+    {492CC257-E27C-4497-B2C1-09C45310C91C}.Release|x86.ActiveCfg = Release|x86
+    {492CC257-E27C-4497-B2C1-09C45310C91C}.Release|x86.Build.0 = Release|x86
+    {6240A044-BD4B-4DDB-9E67-A6CFA5E0C7BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {6240A044-BD4B-4DDB-9E67-A6CFA5E0C7BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {6240A044-BD4B-4DDB-9E67-A6CFA5E0C7BE}.Debug|x64.ActiveCfg = Debug|x64
+    {6240A044-BD4B-4DDB-9E67-A6CFA5E0C7BE}.Debug|x64.Build.0 = Debug|x64
+    {6240A044-BD4B-4DDB-9E67-A6CFA5E0C7BE}.Debug|x86.ActiveCfg = Debug|x86
+    {6240A044-BD4B-4DDB-9E67-A6CFA5E0C7BE}.Debug|x86.Build.0 = Debug|x86
+    {6240A044-BD4B-4DDB-9E67-A6CFA5E0C7BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {6240A044-BD4B-4DDB-9E67-A6CFA5E0C7BE}.Release|Any CPU.Build.0 = Release|Any CPU
+    {6240A044-BD4B-4DDB-9E67-A6CFA5E0C7BE}.Release|x64.ActiveCfg = Release|x64
+    {6240A044-BD4B-4DDB-9E67-A6CFA5E0C7BE}.Release|x64.Build.0 = Release|x64
+    {6240A044-BD4B-4DDB-9E67-A6CFA5E0C7BE}.Release|x86.ActiveCfg = Release|x86
+    {6240A044-BD4B-4DDB-9E67-A6CFA5E0C7BE}.Release|x86.Build.0 = Release|x86
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution

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

@@ -147 +147 @@
     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
       <HintPath>..\..\..\..\trunk\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Random-3.3">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Random-3.3.dll</HintPath>
       <Private>False</Private>
     </Reference>

branches/1614_GeneralizedQAP/HeuristicLab.Optimization.Views/3.3/IOptimizerView.Designer.cs

@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
-      this.components = new System.ComponentModel.Container();
       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(IOptimizerView));
       this.startButton = new System.Windows.Forms.Button();
@@ -53 +52 @@
       this.stopButton = new System.Windows.Forms.Button();
       this.resetButton = new System.Windows.Forms.Button();
-      this.executionTimer = new System.Windows.Forms.Timer(this.components);
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.SuspendLayout();
@@ -134 +132 @@
       this.resetButton.Click += new System.EventHandler(this.resetButton_Click);
       // 
-      // executionTimer
-      // 
-      this.executionTimer.Interval = 200;
-      this.executionTimer.Tick += new System.EventHandler(this.executionTimer_Tick);
-      //
       // IOptimizerView
       // 
@@ -173 +166 @@
     protected System.Windows.Forms.Button pauseButton;
     protected System.Windows.Forms.Button stopButton;
-    protected System.Windows.Forms.Timer executionTimer;
     protected System.Windows.Forms.Button resetButton;
 

branches/1614_GeneralizedQAP/HeuristicLab.Optimization.Views/3.3/IOptimizerView.cs

@@ -44 +44 @@
       Content.ExceptionOccurred -= new EventHandler<EventArgs<Exception>>(Content_ExceptionOccurred);
       Content.ExecutionStateChanged -= new EventHandler(Content_ExecutionStateChanged);
+      Content.ExecutionTimeChanged -= new EventHandler(Content_ExecutionTimeChanged);
       Content.Prepared -= new EventHandler(Content_Prepared);
       Content.Started -= new EventHandler(Content_Started);
@@ -54 +55 @@
       Content.ExceptionOccurred += new EventHandler<EventArgs<Exception>>(Content_ExceptionOccurred);
       Content.ExecutionStateChanged += new EventHandler(Content_ExecutionStateChanged);
+      Content.ExecutionTimeChanged += new EventHandler(Content_ExecutionTimeChanged);
       Content.Prepared += new EventHandler(Content_Prepared);
       Content.Started += new EventHandler(Content_Started);
@@ -62 +64 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
-      if (Content != null) {
+      if (Content == null) {
+        executionTimeTextBox.Text = "-";
+      } else {
         Locked = ReadOnly = Content.ExecutionState == ExecutionState.Started;
+        executionTimeTextBox.Text = Content.ExecutionTime.ToString();
       }
-      UpdateExecutionTime();
     }
 
@@ -86 +90 @@
       else {
         nameTextBox.Enabled = infoLabel.Enabled = true;
-        UpdateExecutionTime();
         ReadOnly = Locked = false;
         SetEnabledStateOfExecutableButtons();
@@ -95 +98 @@
         Invoke(new EventHandler(Content_Started), sender, e);
       else {
-        executionTimer.Start();
         nameTextBox.Enabled = infoLabel.Enabled = false;
         ReadOnly = Locked = true;
@@ -105 +107 @@
         Invoke(new EventHandler(Content_Paused), sender, e);
       else {
-        executionTimer.Stop();
-        UpdateExecutionTime();
         nameTextBox.Enabled = infoLabel.Enabled = true;
         ReadOnly = Locked = false;
@@ -116 +116 @@
         Invoke(new EventHandler(Content_Stopped), sender, e);
       else {
-        executionTimer.Stop();
-        UpdateExecutionTime();
         nameTextBox.Enabled = infoLabel.Enabled = true;
         ReadOnly = Locked = false;
@@ -123 +121 @@
       }
     }
+    protected virtual void Content_ExecutionTimeChanged(object sender, EventArgs e) {
+      if (InvokeRequired)
+        Invoke(new EventHandler(Content_ExecutionTimeChanged), sender, e);
+      else
+        executionTimeTextBox.Text = Content == null ? "-" : Content.ExecutionTime.ToString();
+    }
     protected virtual void Content_ExceptionOccurred(object sender, EventArgs<Exception> e) {
       if (InvokeRequired)
         Invoke(new EventHandler<EventArgs<Exception>>(Content_ExceptionOccurred), sender, e);
-      else {
-        executionTimer.Stop();
-        UpdateExecutionTime();
+      else
         ErrorHandling.ShowErrorDialog(this, e.Value);
-      }
     }
     #endregion
@@ -146 +147 @@
     protected virtual void resetButton_Click(object sender, EventArgs e) {
       Content.Prepare(false);
-    }
-    private void executionTimer_Tick(object sender, EventArgs e) {
-      UpdateExecutionTime();
-    }
-
-    private void UpdateExecutionTime() {
-      executionTimeTextBox.Text = (Content == null ? "-" : Content.ExecutionTime.ToString());
     }
     #endregion

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

@@ -64 +64 @@
       }
     }
-    
-    public abstract TimeSpan ExecutionTime { get; }
+
+    [Storable]
+    private TimeSpan executionTime;
+    public TimeSpan ExecutionTime {
+      get { return executionTime; }
+      protected set {
+        executionTime = value;
+        OnExecutionTimeChanged();
+      }
+    }
 
     public virtual Type ProblemType {
@@ -125 +133 @@
       : base() {
       executionState = ExecutionState.Stopped;
+      executionTime = TimeSpan.Zero;
       storeAlgorithmInEachRun = false;
       runsCounter = 0;
@@ -132 +141 @@
       : base(name) {
       executionState = ExecutionState.Stopped;
+      executionTime = TimeSpan.Zero;
       storeAlgorithmInEachRun = false;
       runsCounter = 0;
@@ -139 +149 @@
       : base(name, parameters) {
       executionState = ExecutionState.Stopped;
+      executionTime = TimeSpan.Zero;
       storeAlgorithmInEachRun = false;
       runsCounter = 0;
@@ -146 +157 @@
       : base(name, description) {
       executionState = ExecutionState.Stopped;
+      executionTime = TimeSpan.Zero;
       storeAlgorithmInEachRun = false;
       runsCounter = 0;
@@ -153 +165 @@
       : base(name, description, parameters) {
       executionState = ExecutionState.Stopped;
+      executionTime = TimeSpan.Zero;
       storeAlgorithmInEachRun = false;
       runsCounter = 0;
@@ -168 +181 @@
       if (ExecutionState == ExecutionState.Started) throw new InvalidOperationException(string.Format("Clone not allowed in execution state \"{0}\".", ExecutionState));
       executionState = original.executionState;
+      executionTime = original.executionTime;
       problem = cloner.Clone(original.problem);
       storeAlgorithmInEachRun = original.storeAlgorithmInEachRun;
@@ -246 +260 @@
       if (handler != null) handler(this, EventArgs.Empty);
     }
+    public event EventHandler ExecutionTimeChanged;
+    protected virtual void OnExecutionTimeChanged() {
+      EventHandler handler = ExecutionTimeChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
     public event EventHandler ProblemChanged;
     protected virtual void OnProblemChanged() {
@@ -258 +277 @@
     public event EventHandler Prepared;
     protected virtual void OnPrepared() {
+      ExecutionTime = TimeSpan.Zero;
       foreach (IStatefulItem statefulObject in this.GetObjectGraphObjects(new HashSet<object>() { Runs }).OfType<IStatefulItem>()) {
         statefulObject.InitializeState();
@@ -328 +348 @@
     }
     #endregion
-
-    [Obsolete("Deprecate, does nothing, needs to be removed from IExecutable")]
-    public event EventHandler ExecutionTimeChanged;
   }
 }

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

@@ -21 +21 @@
 
 using System;
+using System.Linq;
 using System.Threading;
 using HeuristicLab.Common;
@@ -31 +32 @@
 
     private bool pausePending;
-    private bool executionTimeActive;
+    private DateTime lastUpdateTime;
 
     public string Filename { get; set; }
@@ -51 +52 @@
     }
 
-    [Storable]
-    private TimeSpan executionTime;
-    private DateTime startDate;
-    public override TimeSpan ExecutionTime {
-      get { return executionTime + (executionTimeActive ? DateTime.UtcNow - startDate : TimeSpan.Zero); }
-    }
-
     [StorableConstructor]
     protected BasicAlgorithm(bool deserializing) : base(deserializing) { }
@@ -64 +58 @@
       results = cloner.Clone(original.Results);
       initialized = original.initialized;
-      executionTime = original.executionTime;
     }
     protected BasicAlgorithm()
       : base() {
       results = new ResultCollection();
-      executionTime = TimeSpan.Zero;
     }
 
     public override void Prepare() {
-      executionTime = TimeSpan.Zero;
       if (Problem == null) return;
       base.Prepare();
@@ -82 +73 @@
 
     public override void Start(CancellationToken cancellationToken) {
-      startDate = DateTime.UtcNow;
-      executionTimeActive = true;
       base.Start(cancellationToken);
       CancellationTokenSource = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
@@ -125 +114 @@
     private void Run(object state) {
       CancellationToken cancellationToken = (CancellationToken)state;
-      if (!initialized)
-        Initialize(cancellationToken);
-      initialized = true;
-      Run(cancellationToken);
+      lastUpdateTime = DateTime.UtcNow;
+      System.Timers.Timer timer = new System.Timers.Timer(250);
+      timer.AutoReset = true;
+      timer.Elapsed += new System.Timers.ElapsedEventHandler(timer_Elapsed);
+      timer.Start();
+      try {
+        if (!initialized)
+          Initialize(cancellationToken);
+        initialized = true;
+        Run(cancellationToken);
+      }
+      finally {
+        timer.Elapsed -= new System.Timers.ElapsedEventHandler(timer_Elapsed);
+        timer.Stop();
+        ExecutionTime += DateTime.UtcNow - lastUpdateTime;
+      }
     }
 
@@ -134 +135 @@
     protected abstract void Run(CancellationToken cancellationToken);
 
-    protected override void OnPaused() {
-      executionTime += DateTime.UtcNow - startDate;
-      executionTimeActive = false;
-      base.OnPaused();
+    #region Events
+    private void timer_Elapsed(object sender, System.Timers.ElapsedEventArgs e) {
+      System.Timers.Timer timer = (System.Timers.Timer)sender;
+      timer.Enabled = false;
+      DateTime now = DateTime.UtcNow;
+      ExecutionTime += now - lastUpdateTime;
+      lastUpdateTime = now;
+      timer.Enabled = true;
     }
+    #endregion
 
-    protected override void OnStopped() {
-      if (executionTimeActive) { // don't do if going from pause to stop
-        executionTime += DateTime.UtcNow - startDate;
-        executionTimeActive = false;
-      }
-      base.OnStopped();
-    }
   }
 }

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

@@ -71 +71 @@
     }
 
-    public override TimeSpan ExecutionTime {
-      get { return engine.ExecutionTime; }
-    }
-
     public override ResultCollection Results {
       get {
@@ -200 +196 @@
     private void RegisterEngineEvents() {
       Engine.ExceptionOccurred += new EventHandler<EventArgs<Exception>>(Engine_ExceptionOccurred);
+      Engine.ExecutionTimeChanged += new EventHandler(Engine_ExecutionTimeChanged);
       Engine.Paused += new EventHandler(Engine_Paused);
       Engine.Prepared += new EventHandler(Engine_Prepared);
@@ -207 +204 @@
     private void DeregisterEngineEvents() {
       Engine.ExceptionOccurred -= new EventHandler<EventArgs<Exception>>(Engine_ExceptionOccurred);
+      Engine.ExecutionTimeChanged -= new EventHandler(Engine_ExecutionTimeChanged);
       Engine.Paused -= new EventHandler(Engine_Paused);
       Engine.Prepared -= new EventHandler(Engine_Prepared);
@@ -214 +212 @@
     private void Engine_ExceptionOccurred(object sender, EventArgs<Exception> e) {
       OnExceptionOccurred(e.Value);
+    }
+    private void Engine_ExecutionTimeChanged(object sender, EventArgs e) {
+      ExecutionTime = Engine.ExecutionTime;
     }
     private void Engine_Paused(object sender, EventArgs e) {

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

@@ -21 +21 @@
 
 using System;
-using System.Threading;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -38 +37 @@
     }
 
-    [Storable]
-    private TimeSpan executionTime;
-    private DateTime startDate;
-    public override TimeSpan ExecutionTime {
-      get { return executionTime + (ExecutionState == ExecutionState.Started ? DateTime.UtcNow - startDate : TimeSpan.Zero); }
-    }
-
-    protected HeuristicOptimizationAlgorithm() : base() {
-      executionTime = TimeSpan.Zero;
-    }
-    protected HeuristicOptimizationAlgorithm(string name) : base(name) {
-      executionTime = TimeSpan.Zero;
-    }
-    protected HeuristicOptimizationAlgorithm(string name, ParameterCollection parameters) : base(name, parameters) {
-      executionTime = TimeSpan.Zero;
-    }
-    protected HeuristicOptimizationAlgorithm(string name, string description) : base(name, description) {
-      executionTime = TimeSpan.Zero;
-    }
-    protected HeuristicOptimizationAlgorithm(string name, string description, ParameterCollection parameters) : base(name, description, parameters) {
-      executionTime = TimeSpan.Zero;
-    }
+    protected HeuristicOptimizationAlgorithm() : base() { }
+    protected HeuristicOptimizationAlgorithm(string name) : base(name) { }
+    protected HeuristicOptimizationAlgorithm(string name, ParameterCollection parameters) : base(name, parameters) { }
+    protected HeuristicOptimizationAlgorithm(string name, string description) : base(name, description) { }
+    protected HeuristicOptimizationAlgorithm(string name, string description, ParameterCollection parameters) : base(name, description, parameters) { }
 
     [StorableConstructor]
     protected HeuristicOptimizationAlgorithm(bool deserializing) : base(deserializing) { }
-    protected HeuristicOptimizationAlgorithm(HeuristicOptimizationAlgorithm original, Cloner cloner)
-      : base(original, cloner) {
-      executionTime = original.executionTime;
-    }
-
-    public override void Prepare() {
-      executionTime = TimeSpan.Zero;
-      base.Prepare();
-    }
-
-    public override void Start(CancellationToken cancellationToken) {
-      startDate = DateTime.UtcNow;
-      base.Start(cancellationToken);
-    }
+    protected HeuristicOptimizationAlgorithm(HeuristicOptimizationAlgorithm original, Cloner cloner) : base(original, cloner) { }
 
     #region Events
@@ -93 +62 @@
     protected virtual void Problem_EvaluatorChanged(object sender, EventArgs e) { }
     #endregion
-
-    protected override void OnPaused() {
-      var elapsed = DateTime.UtcNow - startDate;
-      executionTime += elapsed;
-      base.OnPaused();
-    }
-
-    protected override void OnStopped() {
-      if (ExecutionState == ExecutionState.Started) {
-        var elapsed = DateTime.UtcNow - startDate;
-        executionTime += elapsed;
-      }
-      base.OnStopped();
-    }
   }
 }

branches/1614_GeneralizedQAP/HeuristicLab.Optimization/3.3/MetaOptimizers/BatchRun.cs

@@ -68 +68 @@
       }
     }
-    
+
     [Storable]
     private TimeSpan executionTime;
     public TimeSpan ExecutionTime {
-      get { return executionTime + (Optimizer?.ExecutionTime ?? TimeSpan.Zero); }
-    }
+      get {
+        if ((Optimizer != null) && (Optimizer.ExecutionState != ExecutionState.Stopped))
+          return executionTime + Optimizer.ExecutionTime;
+        else
+          return executionTime;
+      }
+      private set {
+        executionTime = value;
+        OnExecutionTimeChanged();
+      }
+    }
+
+    [Storable]
+    private TimeSpan runsExecutionTime;
 
     [Storable]
@@ -162 +174 @@
       executionState = ExecutionState.Stopped;
       executionTime = TimeSpan.Zero;
+      runsExecutionTime = TimeSpan.Zero;
       repetitions = 10;
       repetitionsCounter = 0;
@@ -171 +184 @@
       executionState = ExecutionState.Stopped;
       executionTime = TimeSpan.Zero;
+      runsExecutionTime = TimeSpan.Zero;
       repetitions = 10;
       repetitionsCounter = 0;
@@ -179 +193 @@
       executionState = ExecutionState.Stopped;
       executionTime = TimeSpan.Zero;
+      runsExecutionTime = TimeSpan.Zero;
       repetitions = 10;
       repetitionsCounter = 0;
@@ -194 +209 @@
       executionState = original.executionState;
       executionTime = original.executionTime;
+      runsExecutionTime = original.runsExecutionTime;
       optimizer = cloner.Clone(original.optimizer);
       repetitions = original.repetitions;
@@ -218 +234 @@
         throw new InvalidOperationException(string.Format("Prepare not allowed in execution state \"{0}\".", ExecutionState));
       if (Optimizer != null) {
-        executionTime = TimeSpan.Zero;
+        ExecutionTime = TimeSpan.Zero;
         RepetitionsCounter = 0;
         if (clearRuns) runs.Clear();
@@ -282 +298 @@
       if (handler != null) handler(this, EventArgs.Empty);
     }
-    [Obsolete("Deprecated needs to be removed")]
     public event EventHandler ExecutionTimeChanged;
+    private void OnExecutionTimeChanged() {
+      EventHandler handler = ExecutionTimeChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
     public event EventHandler OptimizerChanged;
     private void OnOptimizerChanged() {
@@ -335 +354 @@
     private void RegisterOptimizerEvents() {
       optimizer.ExceptionOccurred += new EventHandler<EventArgs<Exception>>(Optimizer_ExceptionOccurred);
+      optimizer.ExecutionTimeChanged += new EventHandler(Optimizer_ExecutionTimeChanged);
       optimizer.Paused += new EventHandler(Optimizer_Paused);
       optimizer.Prepared += new EventHandler(Optimizer_Prepared);
@@ -345 +365 @@
     private void DeregisterOptimizerEvents() {
       optimizer.ExceptionOccurred -= new EventHandler<EventArgs<Exception>>(Optimizer_ExceptionOccurred);
+      optimizer.ExecutionTimeChanged -= new EventHandler(Optimizer_ExecutionTimeChanged);
       optimizer.Paused -= new EventHandler(Optimizer_Paused);
       optimizer.Prepared -= new EventHandler(Optimizer_Prepared);
@@ -356 +377 @@
       OnExceptionOccurred(e.Value);
     }
+    private void Optimizer_ExecutionTimeChanged(object sender, EventArgs e) {
+      OnExecutionTimeChanged();
+    }
     private void Optimizer_Paused(object sender, EventArgs e) {
       if (ExecutionState == ExecutionState.Started) {
@@ -363 +387 @@
     private void Optimizer_Prepared(object sender, EventArgs e) {
       if (batchRunAction == BatchRunAction.Prepare || ExecutionState == ExecutionState.Stopped) {
+        ExecutionTime = TimeSpan.Zero;
+        runsExecutionTime = TimeSpan.Zero;
         RepetitionsCounter = 0;
         OnPrepared();
@@ -373 +399 @@
     private void Optimizer_Stopped(object sender, EventArgs e) {
       RepetitionsCounter++;
+      ExecutionTime += runsExecutionTime;
+      runsExecutionTime = TimeSpan.Zero;
 
       if (batchRunAction == BatchRunAction.Stop) OnStopped();
@@ -407 +435 @@
     private void Runs_CollectionReset(object sender, CollectionItemsChangedEventArgs<IRun> e) {
       if (Optimizer != null) Optimizer.Runs.RemoveRange(e.OldItems);
-      executionTime += SumExecutionTimes(e.OldItems);
-      executionTime += SumExecutionTimes(e.Items);
+      foreach (IRun run in e.Items) {
+        IItem item;
+        run.Results.TryGetValue("Execution Time", out item);
+        TimeSpanValue executionTime = item as TimeSpanValue;
+        if (executionTime != null) ExecutionTime += executionTime.Value;
+      }
     }
     private void Runs_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IRun> e) {
-      executionTime += SumExecutionTimes(e.Items);
+      foreach (IRun run in e.Items) {
+        IItem item;
+        run.Results.TryGetValue("Execution Time", out item);
+        TimeSpanValue executionTime = item as TimeSpanValue;
+        if (executionTime != null) {
+          if (Optimizer.ExecutionState == ExecutionState.Started)
+            runsExecutionTime += executionTime.Value;
+          else
+            ExecutionTime += executionTime.Value;
+        }
+      }
     }
     private void Runs_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IRun> e) {
       if (Optimizer != null) Optimizer.Runs.RemoveRange(e.Items);
-      executionTime -= SumExecutionTimes(e.Items);
-    }
-    private TimeSpan SumExecutionTimes(IEnumerable<IRun> runs) {
-      var sum = TimeSpan.Zero;
-      foreach (IRun run in runs) {
-        IItem item;
-        run.Results.TryGetValue("Execution Time", out item);
-        TimeSpanValue exTime = item as TimeSpanValue;
-        if (exTime != null) sum += exTime.Value;
-      }
-      return sum;
     }
     #endregion

branches/1614_GeneralizedQAP/HeuristicLab.Optimization/3.3/MetaOptimizers/Experiment.cs

@@ -70 +70 @@
     private TimeSpan executionTime;
     public TimeSpan ExecutionTime {
-      get { return executionTime + Optimizers.Aggregate(TimeSpan.Zero, (a, x) => a + x.ExecutionTime); }
+      get { return executionTime; }
+      private set {
+        executionTime = value;
+        OnExecutionTimeChanged();
+      }
     }
 
@@ -278 +282 @@
       if (handler != null) handler(this, EventArgs.Empty);
     }
-    [Obsolete("deprecated needs to be removed")]
     public event EventHandler ExecutionTimeChanged;
+    private void OnExecutionTimeChanged() {
+      EventHandler handler = ExecutionTimeChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
     public event EventHandler Prepared;
     private void OnPrepared() {
@@ -362 +369 @@
     private void RegisterOptimizerEvents(IOptimizer optimizer) {
       optimizer.ExceptionOccurred += new EventHandler<EventArgs<Exception>>(optimizer_ExceptionOccurred);
+      optimizer.ExecutionTimeChanged += new EventHandler(optimizer_ExecutionTimeChanged);
       optimizer.Paused += new EventHandler(optimizer_Paused);
       optimizer.Prepared += new EventHandler(optimizer_Prepared);
@@ -372 +380 @@
     private void DeregisterOptimizerEvents(IOptimizer optimizer) {
       optimizer.ExceptionOccurred -= new EventHandler<EventArgs<Exception>>(optimizer_ExceptionOccurred);
+      optimizer.ExecutionTimeChanged -= new EventHandler(optimizer_ExecutionTimeChanged);
       optimizer.Paused -= new EventHandler(optimizer_Paused);
       optimizer.Prepared -= new EventHandler(optimizer_Prepared);
@@ -386 +395 @@
       lock (locker)
         OnExceptionOccurred(e.Value);
+    }
+    private void optimizer_ExecutionTimeChanged(object sender, EventArgs e) {
+      // only wait for maximally 100ms to acquire lock, otherwise return and don't update the execution time 
+      var success = Monitor.TryEnter(locker, 100);
+      if (!success) return;
+      try {
+        ExecutionTime = Optimizers.Aggregate(TimeSpan.Zero, (t, o) => t + o.ExecutionTime);
+      } finally {
+        Monitor.Exit(locker);
+      }
     }
     private void optimizer_Paused(object sender, EventArgs e) {

branches/1614_GeneralizedQAP/HeuristicLab.Optimization/3.3/MetaOptimizers/TimeLimitRun.cs

@@ -214 +214 @@
 
     private void Initialize() {
-      timer = new System.Timers.Timer();
-      timer.Interval = 50;
-      timer.Elapsed += Timer_Elapsed;
       if (algorithm != null) RegisterAlgorithmEvents();
       snapshotTimes.ItemsAdded += snapshotTimes_Changed;
@@ -258 +255 @@
     }
 
-    private System.Timers.Timer timer;
-
-    private void Timer_Elapsed(object sender, EventArgs e) {
-      if (Algorithm.ExecutionState == ExecutionState.Started) {
-        if (snapshotTimesIndex < SnapshotTimes.Count && ExecutionTime >= SnapshotTimes[snapshotTimesIndex]
-          && !pausedForSnapshot) {
-          pausedForSnapshot = true;
-          Algorithm.Pause();
-        }
-        if (ExecutionTime >= MaximumExecutionTime && !pausedForTermination) {
-          pausedForTermination = true;
-          if (!pausedForSnapshot) Algorithm.Pause();
-        }
-      }
-    }
-
     #region Events
     protected override void OnNameChanged() {
@@ -292 +273 @@
       if (handler != null) handler(this, EventArgs.Empty);
     }
-    [Obsolete("Deprecated needs to be removed")]
     public event EventHandler ExecutionTimeChanged;
+    private void OnExecutionTimeChanged() {
+      var handler = ExecutionTimeChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
     public event EventHandler Prepared;
     private void OnPrepared() {
@@ -301 +285 @@
     public event EventHandler Started;
     private void OnStarted() {
-      timer.Start();
       var handler = Started;
       if (handler != null) handler(this, EventArgs.Empty);
@@ -307 +290 @@
     public event EventHandler Paused;
     private void OnPaused() {
-      timer.Stop();
       var handler = Paused;
       if (handler != null) handler(this, EventArgs.Empty);
@@ -313 +295 @@
     public event EventHandler Stopped;
     private void OnStopped() {
-      timer.Stop();
       var handler = Stopped;
       if (handler != null) handler(this, EventArgs.Empty);
@@ -327 +308 @@
     private void RegisterAlgorithmEvents() {
       algorithm.ExceptionOccurred += Algorithm_ExceptionOccurred;
+      algorithm.ExecutionTimeChanged += Algorithm_ExecutionTimeChanged;
       algorithm.ExecutionStateChanged += Algorithm_ExecutionStateChanged;
       algorithm.Paused += Algorithm_Paused;
@@ -335 +317 @@
     private void DeregisterAlgorithmEvents() {
       algorithm.ExceptionOccurred -= Algorithm_ExceptionOccurred;
+      algorithm.ExecutionTimeChanged -= Algorithm_ExecutionTimeChanged;
       algorithm.ExecutionStateChanged -= Algorithm_ExecutionStateChanged;
       algorithm.Paused -= Algorithm_Paused;
@@ -343 +326 @@
     private void Algorithm_ExceptionOccurred(object sender, EventArgs<Exception> e) {
       OnExceptionOccurred(e.Value);
+    }
+    private void Algorithm_ExecutionTimeChanged(object sender, EventArgs e) {
+      if (snapshotTimesIndex < SnapshotTimes.Count && ExecutionTime >= SnapshotTimes[snapshotTimesIndex]
+        && !pausedForSnapshot) {
+        pausedForSnapshot = true;
+        Algorithm.Pause();
+      }
+      if (ExecutionTime >= MaximumExecutionTime && !pausedForTermination) {
+        pausedForTermination = true;
+        if (!pausedForSnapshot) Algorithm.Pause();
+      }
+      OnExecutionTimeChanged();
     }
     private void Algorithm_ExecutionStateChanged(object sender, EventArgs e) {

branches/1614_GeneralizedQAP/HeuristicLab.OptimizationExpertSystem.Common/3.3/HeuristicLab.OptimizationExpertSystem.Common-3.3.csproj

@@ -170 +170 @@
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
-      <Project>{DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}</Project>
-      <Name>HeuristicLab.Encodings.PermutationEncoding-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
       <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>