Changeset 15065 for branches/Async/HeuristicLab.Tests/HeuristicLab.Algorithms.DataAnalysis-3.4

Timestamp:

06/26/17 09:45:36 (7 years ago)

Author:

jkarder

Message:

#2258: refactored async methods

• synchronously called IExecutables are now executed in the caller's thread
• removed old synchronization code from unit tests

Location:

branches/Async/HeuristicLab.Tests/HeuristicLab.Algorithms.DataAnalysis-3.4

Files:

• GaussianProcessRegressionTest.cs (modified) (4 diffs)
• GradientBoostingTest.cs (modified) (4 diffs)
• SupportVectorMachineTest.cs (modified) (4 diffs)

branches/Async/HeuristicLab.Tests/HeuristicLab.Algorithms.DataAnalysis-3.4/GaussianProcessRegressionTest.cs

@@ -22 +22 @@
 using System;
 using System.Linq;
-using System.Threading;
 using HeuristicLab.Common;
 using HeuristicLab.Problems.DataAnalysis;
@@ -39 +38 @@
     }
 
-    private EventWaitHandle trigger = new AutoResetEvent(false);
     private Exception ex;
 
@@ -65 +63 @@
 
       alg.ExceptionOccurred += new EventHandler<EventArgs<Exception>>(cv_ExceptionOccurred);
-      alg.Stopped += new EventHandler(cv_Stopped);
 
       alg.Prepare();
       alg.Start();
-      trigger.WaitOne();
       if (ex != null) throw ex;
 
@@ -78 +74 @@
       ex = e.Value;
     }
-
-    private void cv_Stopped(object sender, EventArgs e) {
-      trigger.Set();
-    }
   }
 }

branches/Async/HeuristicLab.Tests/HeuristicLab.Algorithms.DataAnalysis-3.4/GradientBoostingTest.cs

@@ -1 +1 @@
 using System;
 using System.Linq;
-using System.Threading;
 using HeuristicLab.Data;
-using HeuristicLab.Optimization;
 using HeuristicLab.Problems.DataAnalysis;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -182 +180 @@
       #endregion
 
-      RunAlgorithm(gbt);
+      gbt.Start();
 
       Console.WriteLine(gbt.ExecutionTime);
@@ -210 +208 @@
       #endregion
 
-      RunAlgorithm(gbt);
+      gbt.Start();
 
       Console.WriteLine(gbt.ExecutionTime);
@@ -238 +236 @@
       #endregion
 
-      RunAlgorithm(gbt);
+      gbt.Start();
 
       Console.WriteLine(gbt.ExecutionTime);
       Assert.AreEqual(0.061954221604374943, ((DoubleValue)gbt.Results["Loss (train)"].Value).Value, 1E-6);
       Assert.AreEqual(0.06316303473499961, ((DoubleValue)gbt.Results["Loss (test)"].Value).Value, 1E-6);
-    }
-
-    // same as in SamplesUtil
-    private 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.Prepare();
-      a.Start();
-      trigger.WaitOne();
-
-      Assert.AreEqual(ex, null);
     }
 

branches/Async/HeuristicLab.Tests/HeuristicLab.Algorithms.DataAnalysis-3.4/SupportVectorMachineTest.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
 using HeuristicLab.Algorithms.DataAnalysis;
 using HeuristicLab.Common;
@@ -50 +49 @@
     }
 
-    private EventWaitHandle trigger = new AutoResetEvent(false);
     private Exception ex;
 
@@ -71 +69 @@
 
       cv.ExceptionOccurred += new EventHandler<EventArgs<Exception>>(cv_ExceptionOccurred);
-      cv.Stopped += new EventHandler(cv_Stopped);
 
       cv.Prepare();
       cv.Start();
-      trigger.WaitOne();
       if (ex != null) throw ex;
 
@@ -102 +98 @@
       ex = e.Value;
     }
-
-    private void cv_Stopped(object sender, EventArgs e) {
-      trigger.Set();
-    }
   }
 }