Changeset 5399 for branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager/3.3

Timestamp:

01/31/11 10:35:57 (14 years ago)

Author:

cneumuel

Message:

#1260

• fixed wiring of textboxes in HiveExperimentManager
• robustified results polling in HiveExperimentManager
• robustified HiveEngine

Location:

branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager/3.3

Files:

• HiveExperimentList.cs (modified) (1 diff)
• HiveExperimentManager.cs (modified) (5 diffs)
• JobResultPoller.cs (modified) (1 diff)

branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager/3.3/HiveExperimentList.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.Hive.ExperimentManager {
-  [Item("HiveExperiment List", "Represents a list of hive experiments.")]
+  [Item("HiveExperiment Collection", "Represents a list of hive experiments.")]
   [StorableClass]
-  public class HiveExperimentList : ItemList<HiveExperiment> {
-    public HiveExperimentList() : base() { }
-    public HiveExperimentList(int capacity) : base(capacity) { }
-    public HiveExperimentList(IEnumerable<HiveExperiment> collection) : base(collection) { }
+  public class HiveExperimentCollection : ItemCollection<HiveExperiment> {
+    public HiveExperimentCollection() : base() { }
+    public HiveExperimentCollection(int capacity) : base(capacity) { }
+    public HiveExperimentCollection(IEnumerable<HiveExperiment> collection) : base(collection) { }
 
     [StorableConstructor]
-    protected HiveExperimentList(bool deserializing) : base(deserializing) { }
-    protected HiveExperimentList(HiveExperimentList original, Cloner cloner)
+    protected HiveExperimentCollection(bool deserializing) : base(deserializing) { }
+    protected HiveExperimentCollection(HiveExperimentCollection original, Cloner cloner)
       : base(original, cloner) {
     }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new HiveExperimentList(this, cloner);
+      return new HiveExperimentCollection(this, cloner);
     }
   }

branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager/3.3/HiveExperimentManager.cs

@@ -42 +42 @@
     }
 
-    private HiveExperimentList hiveExperiments;
-    public HiveExperimentList HiveExperiments {
+    private HiveExperimentCollection hiveExperiments;
+    public HiveExperimentCollection HiveExperiments {
       get { return hiveExperiments; }
       set {
@@ -73 +73 @@
     private void RegisterHiveExperimentsEvent() {
       if (hiveExperiments != null) {
-        hiveExperiments.ItemsRemoved += new CollectionItemsChangedEventHandler<IndexedItem<HiveExperiment>>(hiveExperiments_ItemsRemoved);
+        hiveExperiments.ItemsRemoved += new CollectionItemsChangedEventHandler<HiveExperiment>(hiveExperiments_ItemsRemoved);
       }
     }
@@ -79 +79 @@
     private void DeRegisterHiveExperimentsEvents() {
       if (hiveExperiments != null) {
-        hiveExperiments.ItemsRemoved -= new CollectionItemsChangedEventHandler<IndexedItem<HiveExperiment>>(hiveExperiments_ItemsRemoved);
+        hiveExperiments.ItemsRemoved -= new CollectionItemsChangedEventHandler<HiveExperiment>(hiveExperiments_ItemsRemoved);
       }
     }
@@ -100 +100 @@
         IsProgressing = true;
         if (this.HiveExperiments == null) {
-          this.HiveExperiments = new HiveExperimentList();
+          this.HiveExperiments = new HiveExperimentCollection();
         }
         using (Disposable<IClientFacade> service = ServiceLocator.Instance.ClientFacadePool.GetService()) {
@@ -149 +149 @@
     }
 
-    void hiveExperiments_ItemsRemoved(object sender, Collections.CollectionItemsChangedEventArgs<Collections.IndexedItem<HiveExperiment>> e) {
+    void hiveExperiments_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<HiveExperiment> e) {
       if (!currentlyUpdating) {
         using (Disposable<IClientFacade> service = ServiceLocator.Instance.ClientFacadePool.GetService()) {
-          foreach (IndexedItem<HiveExperiment> item in e.Items) {
-            if (item.Value.HiveExperimentId != Guid.Empty) {
-              service.Obj.DeleteHiveExperiment(item.Value.HiveExperimentId);
+          foreach (HiveExperiment item in e.Items) {
+            if (item.HiveExperimentId != Guid.Empty) {
+              service.Obj.DeleteHiveExperiment(item.HiveExperimentId);
             }
           }

branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager/3.3/JobResultPoller.cs

@@ -92 +92 @@
       catch (Exception e) {
         OnExceptionOccured(e);
+        IsPolling = false;
       }
     }
 
     private void FetchJobResults() {
-      ResponseObject<JobResultList> response;
-      using (Disposable<IClientFacade> service = ServiceLocator.Instance.StreamedClientFacadePool.GetService()) {
-        response = service.Obj.GetChildJobResults(hiveJob.JobDto.Id, true, true);
+      int repetitions = 5;
+      ResponseObject<JobResultList> response = null;
+      while (response == null && repetitions > 0) {
+        repetitions--;
+        try {
+          using (Disposable<IClientFacade> service = ServiceLocator.Instance.StreamedClientFacadePool.GetService()) {
+            response = service.Obj.GetChildJobResults(hiveJob.JobDto.Id, true, true);
+          }
+        }
+        catch (Exception e) {
+          if (repetitions == 0)
+            throw e;
+        }
       }
       if (response.StatusMessage == ResponseStatus.Ok) {