Changeset 9493 for trunk/sources/HeuristicLab.Algorithms.DataAnalysis

Timestamp:

05/14/13 14:03:34 (12 years ago)

Author:

sforsten

Message:

#2052: the lock in ClonedAlgorithm_Started has been removed as well as all code related to the bool variable startPending. startPending is never really used. In the methods it is used, there is no chance that the if statement would evaluate to anything else than true.

File:

• trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/CrossValidation.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/CrossValidation.cs

@@ -266 +266 @@
     }
 
-    private bool startPending;
     public void Start() {
       if ((ExecutionState != ExecutionState.Prepared) && (ExecutionState != ExecutionState.Paused))
         throw new InvalidOperationException(string.Format("Start not allowed in execution state \"{0}\".", ExecutionState));
 
-      if (Algorithm != null && !startPending) {
-        startPending = true;
+      if (Algorithm != null) {
         //create cloned algorithms
         if (clonedAlgorithms.Count == 0) {
@@ -335 +333 @@
       if (!pausePending) {
         pausePending = true;
-        if (!startPending) PauseAllClonedAlgorithms();
+        PauseAllClonedAlgorithms();
       }
     }
@@ -352 +350 @@
       if (!stopPending) {
         stopPending = true;
-        if (!startPending) StopAllClonedAlgorithms();
+        StopAllClonedAlgorithms();
       }
     }
@@ -654 +652 @@
     private readonly object locker = new object();
     private void ClonedAlgorithm_Started(object sender, EventArgs e) {
-      lock (locker) {
-        IAlgorithm algorithm = sender as IAlgorithm;
-        if (algorithm != null && !results.ContainsKey(algorithm.Name))
-          results.Add(new Result(algorithm.Name, "Contains results for the specific fold.", algorithm.Results));
-
-        if (startPending) {
-          int startedAlgorithms = clonedAlgorithms.Count(alg => alg.ExecutionState == ExecutionState.Started);
-          if (startedAlgorithms == NumberOfWorkers.Value ||
-             clonedAlgorithms.All(alg => alg.ExecutionState != ExecutionState.Prepared))
-            startPending = false;
-
-          if (pausePending) PauseAllClonedAlgorithms();
-          if (stopPending) StopAllClonedAlgorithms();
-        }
-      }
+      IAlgorithm algorithm = sender as IAlgorithm;
+      if (algorithm != null && !results.ContainsKey(algorithm.Name))
+        results.Add(new Result(algorithm.Name, "Contains results for the specific fold.", algorithm.Results));
+
     }
 
@@ -718 +705 @@
     public event EventHandler Started;
     private void OnStarted() {
-      startPending = false;
       ExecutionState = ExecutionState.Started;
       EventHandler handler = Started;