Changeset 4423 for branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/HiveClient.cs

Timestamp:

09/17/10 10:26:55 (14 years ago)

Author:

cneumuel

Message:

• Refactored HL.Hive.Experiment. JobItems are not called HiveJobs and OptimizerJobs do not contain a hierarchy anymore.
• Dynamic generation of jobs on a slave are not reflected on the client user interface.
• Optimizer-Trees are now strictly synchronized with the HiveJob-Trees (also the ComputeInParallel property is taken into account when the Child HiveJobs are created)
• Improved the way a class can report progress and lock the UI (IProgressReporter, IProgress, Progress, ProgressView)
• Changes were made to the config-files, so that server and clients work with blade12.hpc.fh-hagenberg.at
• Lots of small changes and bugfixes

File:

• branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/HiveClient.cs (modified) (5 diffs)

branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/HiveClient.cs

@@ -11 +11 @@
 using System.ServiceModel;
 using HeuristicLab.Hive.Contracts;
+using HeuristicLab.DataAccess;
+using HeuristicLab.Collections;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Hive.Experiment {
   [Item("Hive Client", "Connects to Hive and lists all submitted experiments by the current user.")]
   [Creatable("Hive")]
-  public class HiveClient : Item {
+  public class HiveClient : Item, IProgressReporter {
     private static object locker = new object();
+    private bool currentlyUpdating;
 
     private ILog log;
@@ -28 +32 @@
       set {
         if (hiveExperiments != value) {
-          if (hiveExperiments != null) {
-            DeRegisterHiveExperimentsEvents();
-          }
+          DeRegisterHiveExperimentsEvents();
           hiveExperiments = value;
           RegisterHiveExperimentsEvent();
@@ -38 +40 @@
     }
 
+    private bool isProgressing;
+    public bool IsProgressing {
+      get { return isProgressing; }
+      set {
+        if (isProgressing != value) {
+          isProgressing = value;
+          OnIsProgressingChanged();
+        }
+      }
+    }
+
+    private IProgress progress;
+    public IProgress Progress {
+      get { return progress; }
+    }
+
     private void RegisterHiveExperimentsEvent() {
-      hiveExperiments.ItemsAdded += new Collections.CollectionItemsChangedEventHandler<Collections.IndexedItem<HiveExperiment>>(hiveExperiments_ItemsAdded);
-      hiveExperiments.ItemsRemoved += new Collections.CollectionItemsChangedEventHandler<Collections.IndexedItem<HiveExperiment>>(hiveExperiments_ItemsRemoved);
-      hiveExperiments.ItemsMoved += new Collections.CollectionItemsChangedEventHandler<Collections.IndexedItem<HiveExperiment>>(hiveExperiments_ItemsMoved);
+      if (hiveExperiments != null) {
+        hiveExperiments.ItemsRemoved += new CollectionItemsChangedEventHandler<IndexedItem<HiveExperiment>>(hiveExperiments_ItemsRemoved);
+      }
     }
 
     private void DeRegisterHiveExperimentsEvents() {
-      hiveExperiments.ItemsAdded -= new Collections.CollectionItemsChangedEventHandler<Collections.IndexedItem<HiveExperiment>>(hiveExperiments_ItemsAdded);
-      hiveExperiments.ItemsRemoved -= new Collections.CollectionItemsChangedEventHandler<Collections.IndexedItem<HiveExperiment>>(hiveExperiments_ItemsRemoved);
-      hiveExperiments.ItemsMoved -= new Collections.CollectionItemsChangedEventHandler<Collections.IndexedItem<HiveExperiment>>(hiveExperiments_ItemsMoved);
-
+      if (hiveExperiments != null) {
+        hiveExperiments.ItemsRemoved -= new CollectionItemsChangedEventHandler<IndexedItem<HiveExperiment>>(hiveExperiments_ItemsRemoved);
+      }
     }
 
     public HiveClient() {
       this.log = new Log();
-      this.HiveExperiments = new HiveExperimentList();
     }
-
 
     public override Common.IDeepCloneable Clone(Common.Cloner cloner) {
@@ -65 +80 @@
 
     public void UpdateExperimentList() {
-      //IClientFacade client = CreateClientFacade();
-      using (Disposable<IClientFacade> service = ServiceLocator.Instance.ClientFacadePool.GetService()) {
-        ResponseObject<JobResultList> response = service.Obj.GetChildJobResults(null, false, false);
-        RefreshExperimentList(response.Obj);
+      this.progress = new Progress("Downloading HiveExperiments...");
+      try {
+        IsProgressing = true;
+        if (this.HiveExperiments == null) {
+          this.HiveExperiments = new HiveExperimentList();
+        }
+        using (Disposable<IClientFacade> service = ServiceLocator.Instance.ClientFacadePool.GetService()) {
+          currentlyUpdating = true;
+          ResponseObject<HiveExperimentDtoList> response = service.Obj.GetHiveExperiments();
+          progress.Status = "Populating HiveExperiment list...";
+          RefreshExperimentList(response.Obj);
+          currentlyUpdating = false;
+        }
       }
-      //ServiceLocator.DisposeClientFacade(client);
+      catch (Exception) {
+        this.HiveExperiments = null;
+        throw;
+      }
+      finally {
+        IsProgressing = false;
+      }
     }
 
-    private void RefreshExperimentList(JobResultList jobResultList) {
-      foreach (JobResult jobResult in jobResultList) {
-        HiveExperiment hiveExperiment = GetHiveExperiment(jobResult);
+    private void RefreshExperimentList(HiveExperimentDtoList hiveExperiments) {
+      foreach (HiveExperimentDto hiveExperimentDto in hiveExperiments) {
+        HiveExperiment hiveExperiment = GetHiveExperiment(hiveExperimentDto.Id);
         if (hiveExperiment == null) {
-          // create new
-          hiveExperiment = new HiveExperiment() { RootJobItem = new JobItem(jobResult) };
-          this.hiveExperiments.Add(hiveExperiment);
+          // not yet there, create new
+          this.HiveExperiments.Add(new HiveExperiment(hiveExperimentDto));
         } else {
           // update
-          //hiveExperiment.RootJob.UpdateJob(jobResult);
+          hiveExperiment.UpdateFromDto(hiveExperimentDto);
         }
       }
     }
 
-    private HiveExperiment GetHiveExperiment(JobResult jobResult) {
-      //var matches = this.hiveExperiments.Where(exp => exp.RootJob != null && exp.RootJob.JobDto.Id == jobResult.JobId);
-      //if (matches.Count() == 0) {
-      //  return null;
-      //} else {
-      //  return matches.First();
-      //}
-      return null;
+    private HiveExperiment GetHiveExperiment(Guid hiveExperimentId) {
+      return this.HiveExperiments.SingleOrDefault(he => he.HiveExperimentId.Equals(hiveExperimentId));
     }
-
-    //private IClientFacade CreateClientFacade() {
-    //  IClientFacade clientFacade = null;
-    //  try {
-    //    clientFacade = ServiceLocator.CreateClientFacade(Settings.Default.HiveServerIp);
-    //  }
-    //  catch (EndpointNotFoundException exception) {
-    //    LogMessage("Could not connect to Server: " + exception.Message);
-    //  }
-    //  return clientFacade;
-    //}
 
     private void LogMessage(string message) {
@@ -120 +132 @@
       if (handler != null) handler(this, EventArgs.Empty);
     }
-
-    void hiveExperiments_ItemsAdded(object sender, Collections.CollectionItemsChangedEventArgs<Collections.IndexedItem<HiveExperiment>> e) {
-      
+    
+    void hiveExperiments_ItemsRemoved(object sender, Collections.CollectionItemsChangedEventArgs<Collections.IndexedItem<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);
+            }
+          }
+        }
+      }
     }
 
-    void hiveExperiments_ItemsRemoved(object sender, Collections.CollectionItemsChangedEventArgs<Collections.IndexedItem<HiveExperiment>> e) {
-      
+    public event EventHandler IsProgressingChanged;
+    private void OnIsProgressingChanged() {
+      var handler = IsProgressingChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
     }
-
-    void hiveExperiments_ItemsMoved(object sender, Collections.CollectionItemsChangedEventArgs<Collections.IndexedItem<HiveExperiment>> e) {
-      
-    }
-
   }
 }