Changeset 15290

Timestamp:

07/27/17 10:06:10 (7 years ago)

Author:

jkarder

Message:

#2258: fixed MultiTrajectoryAnalysis

Location:

branches/FitnessLandscapeAnalysis

Files:

• HeuristicLab.Analysis.FitnessLandscape.Views/MultiTrajectory/MultiTrajectoryView.cs (modified) (1 diff)
• HeuristicLab.Analysis.FitnessLandscape/MultiTrajectory/MultiTrajectoryAnalysis.cs (modified) (6 diffs)

branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape.Views/MultiTrajectory/MultiTrajectoryView.cs

@@ -136 +136 @@
     }
     private void startButton_Click(object sender, System.EventArgs e) {
-      Content.Start();
+      Content.StartAsync();
     }
     private void pauseButton_Click(object sender, System.EventArgs e) {

branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/MultiTrajectory/MultiTrajectoryAnalysis.cs

@@ -1 +1 @@
 using System;
-using System.Linq;
 using System.Collections.Generic;
+using System.Drawing;
+using System.Threading;
+using System.Threading.Tasks;
 using HeuristicLab.Common;
+using HeuristicLab.Common.Resources;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Encodings.BinaryVectorEncoding;
+using HeuristicLab.Encodings.PermutationEncoding;
+using HeuristicLab.Encodings.RealVectorEncoding;
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.PluginInfrastructure;
-using HeuristicLab.Encodings.BinaryVectorEncoding;
-using HeuristicLab.Encodings.RealVectorEncoding;
-using HeuristicLab.Encodings.PermutationEncoding;
-using HeuristicLab.Common.Resources;
-using System.Drawing;
 
 namespace HeuristicLab.Analysis.FitnessLandscape.MultiTrajectory {
@@ -314 +315 @@
       if (handler != null)
         handler(this, EventArgs.Empty);
-    }    
+    }
     protected virtual void OnStoreAlgorithmInEachRunChanged() {
       EventHandler handler = StoreAlgorithmInEachRunChanged;
@@ -445 +446 @@
 
     public void Start() {
+      Start(CancellationToken.None);
+    }
+    public void Start(CancellationToken cancellationToken) {
       running = true;
       ExecutionState = ExecutionState.Started;
       PerformNextStep();
+    }
+    public async Task StartAsync() { await StartAsync(CancellationToken.None); }
+    public async Task StartAsync(CancellationToken cancellationToken) {
+      await AsyncHelper.DoAsync(Start, cancellationToken);
     }
 
@@ -524 +532 @@
         values.Add(string.Format("{0}.{1}", prefix, value.Key), value.Value);
       }
-    }    
+    }
 
     protected virtual void CreateRun() {
@@ -642 +650 @@
       OnProblemChanged();
     }
-    void Algorithm_Runs_ItemsAdded(object sender, Collections.CollectionItemsChangedEventArgs<IRun> e) {      
+    void Algorithm_Runs_ItemsAdded(object sender, Collections.CollectionItemsChangedEventArgs<IRun> e) {
       if (subAlgorithmRuns != null)
         foreach (var run in e.Items) {
@@ -686 +694 @@
           (PreassignedSolutionCreator == null || !(PreassignedSolutionCreator is IRealVectorCreator)))
           PreassignedSolutionCreator = new PreassignedRealVectorCreator();
-        else if (problem.SolutionCreator is IPermutationCreator && 
+        else if (problem.SolutionCreator is IPermutationCreator &&
           (PreassignedSolutionCreator == null || !(PreassignedSolutionCreator is IPermutationCreator)))
-          PreassignedSolutionCreator = new PreassignePermutationCreator();        
-      }      
+          PreassignedSolutionCreator = new PreassignePermutationCreator();
+      }
     }
     #endregion