Changeset 15287 for trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3

Timestamp:

07/26/17 15:48:32 (7 years ago)

Author:

jkarder

Message:

#2258: merged Async branch into trunk

Location:

trunk/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Tests (modified) (1 prop)
• HeuristicLab.Tests/HeuristicLab-3.3/AlgorithmExtensions.cs (deleted)
• HeuristicLab.Tests/HeuristicLab-3.3/CollectObjectGraphTest.cs (modified) (3 diffs)
• HeuristicLab.Tests/HeuristicLab-3.3/GeneticAlgorithmTest.cs (modified) (5 diffs)
• HeuristicLab.Tests/HeuristicLab-3.3/Samples/SamplesUtils.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3/CollectObjectGraphTest.cs

@@ -24 +24 @@
 using System.Diagnostics;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 using HeuristicLab.Algorithms.GeneticAlgorithm;
@@ -125 +124 @@
         algs.Add(ga);
 
-        var cancellationTokenSource = new CancellationTokenSource();
-        ga.StartSync(cancellationTokenSource.Token);
+        ga.Start();
         sw.Stop();
         TestContext.WriteLine("{0}: {1} ", i, sw.Elapsed);
@@ -157 +155 @@
           var sw = new Stopwatch();
           sw.Start();
-          ga.StartSync(new CancellationToken());
+          ga.Start();
           sw.Stop();
           Console.WriteLine("{0}; Objects after execution: {1}", ga.Name, ga.GetObjectGraphObjects().Count());

trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3/GeneticAlgorithmTest.cs

@@ -21 +21 @@
 
 using System;
-using System.Threading;
 using HeuristicLab.Algorithms.GeneticAlgorithm;
 using HeuristicLab.Common;
@@ -39 +38 @@
     }
 
-    private EventWaitHandle trigger = new AutoResetEvent(false);
     private Exception ex;
 
@@ -49 +47 @@
       GeneticAlgorithm ga = (GeneticAlgorithm)XmlParser.Deserialize(@"Test Resources\GA_TSP.hl");
       ga.ExceptionOccurred += new EventHandler<EventArgs<Exception>>(ga_ExceptionOccurred);
-      ga.Stopped += new EventHandler(ga_Stopped);
       ga.SetSeedRandomly.Value = false;
       ga.Seed.Value = 0;
@@ -55 +52 @@
       ga.Prepare();
       ga.Start();
-      trigger.WaitOne();
       if (ex != null) throw ex;
 
@@ -80 +76 @@
       ex = e.Value;
     }
-
-    private void ga_Stopped(object sender, EventArgs e) {
-      trigger.Set();
-    }
   }
 }

trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3/Samples/SamplesUtils.cs

@@ -1 +1 @@
 using System;
 using System.Linq;
-using System.Threading;
 using HeuristicLab.Algorithms.ALPS;
 using HeuristicLab.Algorithms.EvolutionStrategy;
@@ -18 +17 @@
 
     public static void RunAlgorithm(IAlgorithm a) {
-      var trigger = new EventWaitHandle(false, EventResetMode.ManualReset);
       Exception ex = null;
-      a.Stopped += (src, e) => { trigger.Set(); };
-      a.ExceptionOccurred += (src, e) => { ex = e.Value; trigger.Set(); };
+      a.ExceptionOccurred += (sender, e) => { ex = e.Value; };
       a.Prepare();
       a.Start();
-      trigger.WaitOne();
-
-      Assert.AreEqual(ex, null);
+      Assert.IsNull(ex);
     }