Changeset 4567 for branches/HeuristicLab.Classification/HeuristicLab.Algorithms.DataAnalysis

Timestamp:

10/07/10 10:07:12 (14 years ago)

Author:

mkommend

Message:

Filled ResultCollection in CrossValidation (ticket #1199).

File:

• branches/HeuristicLab.Classification/HeuristicLab.Algorithms.DataAnalysis/3.3/CrossValidation.cs (modified) (12 diffs)

branches/HeuristicLab.Classification/HeuristicLab.Algorithms.DataAnalysis/3.3/CrossValidation.cs

@@ -43 +43 @@
 
       executionState = ExecutionState.Stopped;
-      executionTime = TimeSpan.Zero;
       runs = new RunCollection();
       runsCounter = 0;
@@ -73 +72 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       CrossValidation clone = (CrossValidation)base.Clone(cloner);
-      clone.DeregisterEvents(); //not necessary
       clone.executionState = executionState;
-      clone.executionTime = executionTime;
       clone.storeAlgorithmInEachRun = storeAlgorithmInEachRun;
       clone.runs = (RunCollection)cloner.Clone(runs);
@@ -88 +85 @@
       return clone;
     }
-
     #endregion
 
@@ -228 +224 @@
     }
 
-    [Storable]
-    private TimeSpan executionTime;
     public TimeSpan ExecutionTime {
       get {
-        if (ExecutionState != ExecutionState.Stopped && ExecutionState != ExecutionState.Prepared)
-          return executionTime + TimeSpan.FromMilliseconds(clonedAlgorithms.Select(x => x.ExecutionTime.TotalMilliseconds).Sum());
-        else
-          return executionTime;
-      }
-      private set {
-        executionTime = value;
-        OnExecutionTimeChanged();
+        if (ExecutionState != ExecutionState.Prepared)
+          return TimeSpan.FromMilliseconds(clonedAlgorithms.Select(x => x.ExecutionTime.TotalMilliseconds).Sum());
+        return TimeSpan.Zero;
       }
     }
@@ -247 +236 @@
       if (ExecutionState == ExecutionState.Started)
         throw new InvalidOperationException(string.Format("Prepare not allowed in execution state \"{0}\".", ExecutionState));
+      results.Clear();
       clonedAlgorithms.Clear();
       if (Algorithm != null) {
@@ -357 +347 @@
         results.Add(result.Name, result.Value);
 
-      results.Add("Execution Time", new TimeSpanValue(TimeSpan.FromMilliseconds(clonedAlgorithms.Select(x => x.ExecutionTime.TotalMilliseconds).Sum())));
+      results.Add("Execution Time", new TimeSpanValue(this.ExecutionTime));
       results.Add("CrossValidation Folds", new RunCollection(runs));
     }
@@ -395 +385 @@
       else throw new NotSupportedException("Could not convert any item type to double");
     }
-
     #endregion
 
@@ -404 +393 @@
       SamplesEnd.ValueChanged += new EventHandler(SamplesEnd_ValueChanged);
       RegisterClonedAlgorithmsEvents();
-      RegisterRunsEvents();
-    }
-    private void DeregisterEvents() {
-      Folds.ValueChanged -= new EventHandler(Folds_ValueChanged);
-      SamplesStart.ValueChanged -= new EventHandler(SamplesStart_ValueChanged);
-      SamplesEnd.ValueChanged -= new EventHandler(SamplesEnd_ValueChanged);
-      DeregisterClonedAlgorithmsEvents();
-      DeregisterRunsEvents();
-
     }
     private void Folds_ValueChanged(object sender, EventArgs e) {
@@ -526 +506 @@
     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);
@@ -563 +547 @@
     }
     #endregion
-
-    #region run events
-    private void RegisterRunsEvents() {
-      runs.CollectionReset += new CollectionItemsChangedEventHandler<IRun>(Runs_CollectionReset);
-      runs.ItemsAdded += new CollectionItemsChangedEventHandler<IRun>(Runs_ItemsAdded);
-      runs.ItemsRemoved += new CollectionItemsChangedEventHandler<IRun>(Runs_ItemsRemoved);
-    }
-    private void DeregisterRunsEvents() {
-      runs.CollectionReset -= new CollectionItemsChangedEventHandler<IRun>(Runs_CollectionReset);
-      runs.ItemsAdded -= new CollectionItemsChangedEventHandler<IRun>(Runs_ItemsAdded);
-      runs.ItemsRemoved -= new CollectionItemsChangedEventHandler<IRun>(Runs_ItemsRemoved);
-    }
-    private void Runs_CollectionReset(object sender, CollectionItemsChangedEventArgs<IRun> e) {
-      foreach (IRun run in e.OldItems) {
-        IItem item;
-        run.Results.TryGetValue("Execution Time", out item);
-        TimeSpanValue executionTime = item as TimeSpanValue;
-        if (executionTime != null) ExecutionTime = this.executionTime - executionTime.Value;
-      }
-      foreach (IRun run in e.Items) {
-        IItem item;
-        run.Results.TryGetValue("Execution Time", out item);
-        TimeSpanValue executionTime = item as TimeSpanValue;
-        if (executionTime != null) ExecutionTime = this.executionTime + executionTime.Value;
-      }
-      runsCounter = Runs.Count;
-    }
-    private void Runs_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IRun> e) {
-      foreach (IRun run in e.Items) {
-        IItem item;
-        run.Results.TryGetValue("Execution Time", out item);
-        TimeSpanValue executionTime = item as TimeSpanValue;
-        if (executionTime != null) this.executionTime = this.executionTime + executionTime.Value;
-      }
-    }
-    private void Runs_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IRun> e) {
-      foreach (IRun run in e.Items) {
-        IItem item;
-        run.Results.TryGetValue("Execution Time", out item);
-        TimeSpanValue executionTime = item as TimeSpanValue;
-        if (executionTime != null) ExecutionTime = this.executionTime - executionTime.Value;
-      }
-    }
-    #endregion
     #endregion
 
@@ -625 +565 @@
       EventHandler handler = Prepared;
       if (handler != null) handler(this, EventArgs.Empty);
+      OnExecutionTimeChanged();
     }
     public event EventHandler Started;
@@ -643 +584 @@
     private void OnStopped() {
       stopPending = false;
+      Dictionary<string, IItem> collectedResults = new Dictionary<string, IItem>();
+      CollectResultValues(collectedResults);
+      results.AddRange(collectedResults.Select(x => new Result(x.Key, x.Value)).Cast<IResult>().ToArray());
       runsCounter++;
       runs.Add(new Run(string.Format("{0} Run {1}", Name, runsCounter), this));