Changeset 6006 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4

Timestamp:

04/12/11 13:43:05 (13 years ago)

Author:

cneumuel

Message:

#1233

• changed relationship between Job and HiveExperiment. There is no more HiveExperiment.RootJobId, instead there is Job.HiveExperimentId.
• One HiveExperiment can now have multiple Experiments.
• TreeView supports multiple root nodes
• HiveEngine creates a HiveExperiment for each set of jobs, so jobs cannot be without an parent experiment anymore (no more loose jobs)
• updated ExperimentManager binaries

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive/3.4/ExperimentManager/ExperimentManagerClient.cs (modified) (11 diffs)
• HeuristicLab.Clients.Hive/3.4/ExperimentManager/HiveJob.cs (added)
• HeuristicLab.Clients.Hive/3.4/ExperimentManager/JobResultPoller.cs (modified) (3 diffs)
• HeuristicLab.Clients.Hive/3.4/HeuristicLab.Clients.Hive-3.4.csproj (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.4/ServiceClients/HiveExperiment.cs (modified) (18 diffs)
• HeuristicLab.Clients.Hive/3.4/ServiceClients/HiveServiceClient.cs (modified) (10 diffs)
• HeuristicLab.Clients.Hive/3.4/ServiceClients/Job.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive/3.4/ServiceClients/LightweightJob.cs (modified) (1 diff)

branches/HeuristicLab.Hive-3.4/sources

@@ -4 +4 @@
 PrecompiledWeb
 CreateEventLogSources
+WindowsFormsTestProject

@@ -4 +4 @@
 PrecompiledWeb
 CreateEventLogSources
+WindowsFormsTestProject

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ExperimentManager/ExperimentManagerClient.cs

@@ -145 +145 @@
 
     public static void StartExperiment(Action<Exception> exceptionCallback, HiveExperiment hiveExperiment) {
-      ExperimentManagerClient.StoreAsync(exceptionCallback, hiveExperiment);
+      ExperimentManagerClient.StoreAsync(
+        new Action<Exception>((Exception ex) => {
+          hiveExperiment.ExecutionState = ExecutionState.Prepared;
+          exceptionCallback(ex);
+        }), hiveExperiment);
       hiveExperiment.ExecutionState = ExecutionState.Started;
     }
@@ -151 +155 @@
     public static void PauseExperiment(HiveExperiment hiveExperiment) {
       ServiceLocator.Instance.CallHiveService(service => {
-        foreach (HiveJob job in hiveExperiment.HiveJob.GetAllHiveJobs()) {
+        foreach (HiveJob job in hiveExperiment.GetAllHiveJobs()) {
           if (job.Job.State != JobState.Finished && job.Job.State != JobState.Aborted && job.Job.State != JobState.Failed)
             service.PauseJob(job.Job.Id);
@@ -161 +165 @@
     public static void StopExperiment(HiveExperiment hiveExperiment) {
       ServiceLocator.Instance.CallHiveService(service => {
-        foreach (HiveJob job in hiveExperiment.HiveJob.GetAllHiveJobs()) {
+        foreach (HiveJob job in hiveExperiment.GetAllHiveJobs()) {
           if (job.Job.State != JobState.Finished && job.Job.State != JobState.Aborted && job.Job.State != JobState.Failed)
             service.StopJob(job.Job.Id);
@@ -185 +189 @@
           }
 
-          hiveExperiment.HiveJob.SetIndexInParentOptimizerList(null);
-
-          int totalJobCount = hiveExperiment.HiveJob.GetAllHiveJobs().Count();
+          foreach (HiveJob hiveJob in hiveExperiment.HiveJobs) {
+            hiveJob.SetIndexInParentOptimizerList(null);
+          }
+
+          // upload HiveExperiment
+          hiveExperiment.Progress.Status = "Uploading HiveExperiment...";
+          hiveExperiment.Id = service.AddHiveExperiment(hiveExperiment);
+
+          int totalJobCount = hiveExperiment.GetAllHiveJobs().Count();
           int jobCount = 0;
 
+          // upload plugins
           hiveExperiment.Progress.Status = "Uploading plugins...";
           this.OnlinePlugins = service.GetPlugins();
@@ -196 +207 @@
           this.alreadyUploadedPlugins.Add(configFilePlugin);
 
+          // upload jobs
           hiveExperiment.Progress.Status = "Uploading jobs...";
-          UploadJobWithChildren(hiveExperiment.Progress, service, hiveExperiment.HiveJob, null, resourceIds, ref jobCount, totalJobCount, configFilePlugin.Id, hiveExperiment.UseLocalPlugins);
-          hiveExperiment.RootJobId = hiveExperiment.HiveJob.Job.Id;
-
-          // insert or update HiveExperiment
-          hiveExperiment.Progress.Status = "Uploading HiveExperiment...";
-          hiveExperiment.Id = service.AddHiveExperiment(hiveExperiment);
+
+          foreach (HiveJob hiveJob in hiveExperiment.HiveJobs) {
+            UploadJobWithChildren(hiveExperiment.Progress, service, hiveJob, null, resourceIds, ref jobCount, totalJobCount, configFilePlugin.Id, hiveExperiment.UseLocalPlugins, hiveExperiment.Id);
+          }
+
           if (hiveExperiment.RefreshAutomatically) hiveExperiment.StartResultPolling();
         });
@@ -239 +250 @@
     /// <param name="parentHiveJob">shall be null if its the root job</param>
     /// <param name="groups"></param>
-    private void UploadJobWithChildren(IProgress progress, IHiveService service, HiveJob hiveJob, HiveJob parentHiveJob, IEnumerable<Guid> groups, ref int jobCount, int totalJobCount, Guid configPluginId, bool useLocalPlugins) {
+    private void UploadJobWithChildren(IProgress progress, IHiveService service, HiveJob hiveJob, HiveJob parentHiveJob, IEnumerable<Guid> groups, ref int jobCount, int totalJobCount, Guid configPluginId, bool useLocalPlugins, Guid hiveExperimentId) {
       jobCount++;
       progress.Status = string.Format("Serializing job {0} of {1}", jobCount, totalJobCount);
@@ -259 +270 @@
       hiveJob.Job.PluginsNeededIds = PluginUtil.GetPluginDependencies(service, this.onlinePlugins, this.alreadyUploadedPlugins, plugins, useLocalPlugins);
       hiveJob.Job.PluginsNeededIds.Add(configPluginId);
+      hiveJob.Job.HiveExperimentId = hiveExperimentId;
 
       progress.Status = string.Format("Uploading job {0} of {1} ({2} kb)", jobCount, totalJobCount, jobData.Data.Count() / 1024);
@@ -270 +282 @@
 
       foreach (HiveJob child in hiveJob.ChildHiveJobs) {
-        UploadJobWithChildren(progress, service, child, hiveJob, groups, ref jobCount, totalJobCount, configPluginId, useLocalPlugins);
+        UploadJobWithChildren(progress, service, child, hiveJob, groups, ref jobCount, totalJobCount, configPluginId, useLocalPlugins, hiveExperimentId);
       }
     }
@@ -276 +288 @@
 
     #region Download Experiment
-    public static void LoadExperiment (HiveExperiment hiveExperiment) {
+    public static void LoadExperiment(HiveExperiment hiveExperiment) {
       hiveExperiment.Progress = new Progress();
       try {
@@ -286 +298 @@
         // fetch all Job objects to create the full tree of tree of HiveJob objects
         hiveExperiment.Progress.Status = "Downloading list of jobs...";
-        allJobs = ServiceLocator.Instance.CallHiveService(s => s.GetLightweightChildJobs(hiveExperiment.RootJobId, true, true));
+        allJobs = ServiceLocator.Instance.CallHiveService(s => s.GetLightweightExperimentJobs(hiveExperiment.Id));
         totalJobCount = allJobs.Count();
 
@@ -299 +311 @@
         IDictionary<Guid, HiveJob> allHiveJobs = downloader.Results;
 
-        hiveExperiment.HiveJob = allHiveJobs[hiveExperiment.RootJobId];
-
-        if (hiveExperiment.HiveJob.Job.DateFinished.HasValue && hiveExperiment.HiveJob.Job.DateCreated.HasValue) {
-          hiveExperiment.ExecutionTime = hiveExperiment.HiveJob.Job.DateFinished.Value - hiveExperiment.HiveJob.Job.DateCreated.Value;
+        hiveExperiment.HiveJobs = new ItemCollection<HiveJob>(allHiveJobs.Values.Where(x => !x.Job.ParentJobId.HasValue));
+        //hiveExperiment.HiveJobs = allHiveJobs[hiveExperiment.RootJobId];
+
+        if (hiveExperiment.IsFinished()) {
+          //hiveExperiment.ExecutionTime = hiveExperiment.HiveJobs.Max(.Job.DateFinished.Value - hiveExperiment.HiveJobs.Job.DateCreated.Value;
           //hiveExperiment.lastUpdateTime = hiveExperiment.HiveJob.Job.DateFinished.Value;
           hiveExperiment.ExecutionState = Core.ExecutionState.Stopped;
           //OnStopped(); // todo: stop timer
         } else {
-          hiveExperiment.ExecutionTime = hiveExperiment.HiveJob.Job.DateCreated.HasValue ? DateTime.Now - hiveExperiment.HiveJob.Job.DateCreated.Value : TimeSpan.Zero;
+          //hiveExperiment.ExecutionTime = hiveExperiment.HiveJobs.Job.DateCreated.HasValue ? DateTime.Now - hiveExperiment.HiveJobs.Job.DateCreated.Value : TimeSpan.Zero;
           //hiveExperiment.lastUpdateTime = DateTime.Now;
           hiveExperiment.ExecutionState = Core.ExecutionState.Started;
           //OnStarted(); // todo: start timer
         }
+        hiveExperiment.UpdateTotalExecutionTime();
 
         // build child-job tree
-        BuildHiveJobTree(hiveExperiment.HiveJob, allJobs, allHiveJobs);
+        foreach (HiveJob hiveJob in hiveExperiment.HiveJobs) {
+          BuildHiveJobTree(hiveJob, allJobs, allHiveJobs);
+        }
         hiveExperiment.UpdateTotalExecutionTime();
 
         if (hiveExperiment.ExecutionState != ExecutionState.Stopped) {
           hiveExperiment.RefreshAutomatically = true;
-        }        
+        }
       }
       finally {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ExperimentManager/JobResultPoller.cs

@@ -31 +31 @@
     private Thread thread;
 
-    private HiveJob hiveJob;
-    public HiveJob HiveJob {
-      get { return hiveJob; }
-      set { hiveJob = value; }
+    private IEnumerable<HiveJob> hiveJobs;
+    public IEnumerable<HiveJob> HiveJobs {
+      get { return hiveJobs; }
+      set { hiveJobs = value; }
     }
 
@@ -54 +54 @@
     }
 
-    public JobResultPoller(HiveJob hiveJob, TimeSpan interval) {
+    public JobResultPoller(IEnumerable<HiveJob> hiveJobs, TimeSpan interval) {
       this.isPolling = false;
-      this.hiveJob = hiveJob;
+      this.hiveJobs = hiveJobs;
       this.interval = interval;
     }
@@ -96 +96 @@
     private void FetchJobResults() {
       ServiceLocator.Instance.CallHiveService(service => {
-        IEnumerable<LightweightJob> response = service.GetLightweightChildJobs(hiveJob.Job.Id, true, true);
-        OnJobResultsReceived(response);
+        var responses = new List<LightweightJob>();
+        foreach (HiveJob hiveJob in HiveJobs) {
+          responses.AddRange(service.GetLightweightChildJobs(hiveJob.Job.Id, true, true));
+        }
+        OnJobResultsReceived(responses);
       });
     }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HeuristicLab.Clients.Hive-3.4.csproj

@@ -128 +128 @@
     <Compile Include="Jobs\OptimizerJob.cs" />
     <Compile Include="HeuristicLabClientsHivePlugin.cs" />
-    <Compile Include="ExperimentManager\HiveJobClient.cs" />
+    <Compile Include="ExperimentManager\HiveJob.cs" />
     <Compile Include="ExperimentManager\JobResultPoller.cs" />
     <Compile Include="PersistenceUtil.cs" />

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceClients/HiveExperiment.cs

@@ -28 +28 @@
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Clients.Hive {
-
+  [StorableClass]
   public partial class HiveExperiment : IDeepCloneable, IContent, IProgressReporter {
     private JobResultPoller jobResultPoller;
 
+    [Storable]
     private bool useLocalPlugins;
     public bool UseLocalPlugins {
@@ -40 +42 @@
     }
 
+    [Storable]
     private ExecutionState executionState;
     public ExecutionState ExecutionState {
@@ -51 +54 @@
     }
 
+    [Storable]
     private TimeSpan executionTime;
     public TimeSpan ExecutionTime {
@@ -62 +66 @@
     }
 
-    private HiveJob hiveJob;
-    public HiveJob HiveJob {
-      get { return hiveJob; }
+    [Storable]
+    private ItemCollection<HiveJob> hiveJobs;
+    public ItemCollection<HiveJob> HiveJobs {
+      get { return hiveJobs; }
       set {
-        DeregisterHiveJobEvents();
-        if (hiveJob != value) {
-          hiveJob = value;
-          RegisterHiveJobEvents();
-          OnHiveJobChanged();
-        }
-      }
-    }
-
+        DeregisterHiveJobsEvents();
+        if (hiveJobs != value) {
+          hiveJobs = value;
+          RegisterHiveJobsEvents();
+          OnHiveJobsChanged();
+        }
+      }
+    }
+
+    [Storable]
     private bool isProgressing;
     public bool IsProgressing {
@@ -87 +93 @@
 
     /** include jobs when refreshing **/
+    [Storable]
     private bool includeJobs;
     public bool IncludeJobs {
@@ -93 +100 @@
     }
 
+    [Storable]
     private bool refreshAutomatically;
     public bool RefreshAutomatically {
@@ -109 +117 @@
     }
 
+    [Storable]
     private IProgress progress;
     public IProgress Progress {
@@ -124 +133 @@
     protected HiveExperiment(HiveExperiment original, Cloner cloner) {
       cloner.RegisterClonedObject(original, this);
-      this.RootJobId = original.RootJobId;
       this.OwnerUserId = original.OwnerUserId;
       this.DateCreated = original.DateCreated;
@@ -158 +166 @@
     }
 
-    public event EventHandler HiveJobChanged;
-    private void OnHiveJobChanged() {
+    public event EventHandler HiveJobsChanged;
+    private void OnHiveJobsChanged() {
       if (jobResultPoller != null && jobResultPoller.IsPolling) {
         jobResultPoller.Stop();
         DeregisterResultPollingEvents();
       }
-      if (HiveJob != null && HiveJob.Job.Id != Guid.Empty) {
+      if (HiveJobs != null && HiveJobs.Count > 0 && GetAllHiveJobs().All(x => x.Job.Id != Guid.Empty)) {
         if (this.RefreshAutomatically)
           StartResultPolling();
       }
-      EventHandler handler = HiveJobChanged;
+      EventHandler handler = HiveJobsChanged;
       if (handler != null) handler(this, EventArgs.Empty);
     }
@@ -185 +193 @@
     #endregion
 
-    private void RegisterHiveJobEvents() {
-      if (HiveJob != null) {
-        HiveJob.JobStateChanged += new EventHandler(HiveJob_JobStateChanged);
-      }
-    }
-
-    private void DeregisterHiveJobEvents() {
-      if (HiveJob != null) {
-        HiveJob.JobStateChanged -= new EventHandler(HiveJob_JobStateChanged);
-      }
+    private void RegisterHiveJobsEvents() {
+      //if (HiveJobs != null) {
+      //  HiveJobs.JobStateChanged += new EventHandler(HiveJob_JobStateChanged);
+      //}
+    }
+
+    private void DeregisterHiveJobsEvents() {
+      //if (HiveJobs != null) {
+      //  HiveJobs.JobStateChanged -= new EventHandler(HiveJob_JobStateChanged);
+      //}
     }
 
     private void HiveJob_JobStateChanged(object sender, EventArgs e) {
-      if (this.HiveJob != null) {
-        this.RootJobId = HiveJob.Job.Id;
-      }
-    }
-
-    public Experiment GetExperiment() {
-      if (this.HiveJob != null) {
-        return HiveJob.OptimizerJob.OptimizerAsExperiment;
+      //if (this.HiveJobs != null) {
+      //  this.RootJobId = HiveJobs.Job.Id;
+      //}
+    }
+
+    public Experiment GetExperiment(int idx) {
+      if (this.HiveJobs != null) {
+        var hj = HiveJobs.ElementAtOrDefault(idx);
+        if (hj != null)
+          return hj.OptimizerJob.OptimizerAsExperiment;
       }
       return null;
     }
 
+    public void AddExperiment(Experiment experiment) {
+      if (this.HiveJobs == null) 
+        this.HiveJobs = new ItemCollection<HiveJob>();
+      this.HiveJobs.Add(new HiveJob(experiment));
+    }
+
     public void SetExperiment(Experiment experiment) {
-      this.HiveJob = new HiveJob(experiment);
+      if (this.HiveJobs == null)
+        this.HiveJobs = new ItemCollection<HiveJob>();
+      else
+        this.HiveJobs.Clear();
+      this.HiveJobs.Add(new HiveJob(experiment));
     }
 
@@ -225 +245 @@
     public void StartResultPolling() {
       if (jobResultPoller == null) {
-        jobResultPoller = new JobResultPoller(HiveJob, /*ApplicationConstants.ResultPollingInterval*/new TimeSpan(0, 0, 5)); //TODO: find a better place for ApplicationConstants
+        jobResultPoller = new JobResultPoller(HiveJobs, /*ApplicationConstants.ResultPollingInterval*/new TimeSpan(0, 0, 5)); //TODO: find a better place for ApplicationConstants
         RegisterResultPollingEvents();
       }
@@ -235 +255 @@
 
     public void StopResultPolling() {
-      if (jobResultPoller.IsPolling) {
+      if (jobResultPoller != null && jobResultPoller.IsPolling) {
         jobResultPoller.Stop();
       }
@@ -256 +276 @@
     private void jobResultPoller_JobResultReceived(object sender, EventArgs<IEnumerable<LightweightJob>> e) {
       foreach (LightweightJob lightweightJob in e.Value) {
-        HiveJob hj = hiveJob.GetHiveJobByJobId(lightweightJob.Id);
+        HiveJob hj = GetHiveJobById(lightweightJob.Id);
         if (hj != null) {
           DateTime lastJobDataUpdate = hj.Job.LastJobDataUpdate;
@@ -272 +292 @@
               } else {
                 if (lightweightJob.ParentJobId.HasValue) {
-                  HiveJob parentHiveJob = HiveJob.GetHiveJobByJobId(lightweightJob.ParentJobId.Value);
+                  HiveJob parentHiveJob = GetHiveJobById(lightweightJob.ParentJobId.Value);
                   parentHiveJob.UpdateChildOptimizer(optimizerJob, hj.Job.Id);
                 }
@@ -290 +310 @@
     }
 
+    public HiveJob GetHiveJobById(Guid jobId) {
+      foreach (HiveJob job in HiveJobs) {
+        HiveJob hj = job.GetHiveJobByJobId(jobId);
+        if (hj != null)
+          return hj;
+      }
+      return null;
+    }
+
     private void UpdateStats() {
-      var jobs = HiveJob.GetAllHiveJobs();
+      var jobs = GetAllHiveJobs();
       this.JobCount = jobs.Count();
       this.CalculatingCount = jobs.Count(j => j.Job.State == JobState.Calculating);
@@ -297 +326 @@
     }
 
-    private bool AllJobsFinished() {
-      return HiveJob.GetAllHiveJobs().All(j => j.Job.State == JobState.Finished
+    public IEnumerable<HiveJob> GetAllHiveJobs() {
+      var jobs = new List<HiveJob>();
+      foreach (HiveJob job in HiveJobs) {
+        jobs.AddRange(job.GetAllHiveJobs());
+      }
+      return jobs;
+    }
+
+    public bool AllJobsFinished() {
+      return GetAllHiveJobs().All(j => j.Job.State == JobState.Finished
                                             || j.Job.State == JobState.Aborted
                                             || j.Job.State == JobState.Failed);
@@ -308 +345 @@
 
     public void UpdateTotalExecutionTime() {
-      this.ExecutionTime = TimeSpan.FromMilliseconds(HiveJob.GetAllHiveJobs().Sum(x => x.Job.ExecutionTime.HasValue ? x.Job.ExecutionTime.Value.TotalMilliseconds : 0));
+      this.ExecutionTime = TimeSpan.FromMilliseconds(GetAllHiveJobs().Sum(x => x.Job.ExecutionTime.HasValue ? x.Job.ExecutionTime.Value.TotalMilliseconds : 0));
     }
     #endregion
@@ -320 +357 @@
       }
     }
+
+    public bool IsFinished() {
+      return HiveJobs != null
+        && HiveJobs.All(x => x.Job.DateFinished.HasValue && x.Job.DateCreated.HasValue);
+    }
   }
 }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceClients/HiveServiceClient.cs

@@ -352 +352 @@
         
         [System.Runtime.Serialization.OptionalFieldAttribute()]
+        private System.Guid HiveExperimentIdField;
+        
+        [System.Runtime.Serialization.OptionalFieldAttribute()]
         private bool IsParentJobField;
         
@@ -396 +399 @@
                     this.FinishWhenChildJobsFinishedField = value;
                     this.RaisePropertyChanged("FinishWhenChildJobsFinished");
+                }
+            }
+        }
+        
+        [System.Runtime.Serialization.DataMemberAttribute()]
+        public System.Guid HiveExperimentId
+        {
+            get
+            {
+                return this.HiveExperimentIdField;
+            }
+            set
+            {
+                if ((this.HiveExperimentIdField.Equals(value) != true))
+                {
+                    this.HiveExperimentIdField = value;
+                    this.RaisePropertyChanged("HiveExperimentId");
                 }
             }
@@ -569 +589 @@
         private string ResourceNamesField;
         
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private System.Guid RootJobIdField;
-        
         [System.Runtime.Serialization.DataMemberAttribute()]
         public int CalculatingCount
@@ -687 +704 @@
                     this.ResourceNamesField = value;
                     this.RaisePropertyChanged("ResourceNames");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Guid RootJobId
-        {
-            get
-            {
-                return this.RootJobIdField;
-            }
-            set
-            {
-                if ((this.RootJobIdField.Equals(value) != true))
-                {
-                    this.RootJobIdField = value;
-                    this.RaisePropertyChanged("RootJobId");
                 }
             }
@@ -1732 +1732 @@
     {
         
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/TriggerLifecycle", ReplyAction="http://tempuri.org/IHiveService/TriggerLifecycleResponse")]
+        void TriggerLifecycle(bool force);
+        
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/AddAppointment", ReplyAction="http://tempuri.org/IHiveService/AddAppointmentResponse")]
         System.Guid AddAppointment(HeuristicLab.Clients.Hive.Appointment appointment);
@@ -1761 +1764 @@
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/GetLightweightChildJobs", ReplyAction="http://tempuri.org/IHiveService/GetLightweightChildJobsResponse")]
         System.Collections.Generic.List<HeuristicLab.Clients.Hive.LightweightJob> GetLightweightChildJobs(System.Nullable<System.Guid> parentJobId, bool recursive, bool includeParent);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/GetLightweightExperimentJobs", ReplyAction="http://tempuri.org/IHiveService/GetLightweightExperimentJobsResponse")]
+        System.Collections.Generic.List<HeuristicLab.Clients.Hive.LightweightJob> GetLightweightExperimentJobs(System.Guid experimentId);
         
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/GetJobData", ReplyAction="http://tempuri.org/IHiveService/GetJobDataResponse")]
@@ -1867 +1873 @@
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/GetResourceId", ReplyAction="http://tempuri.org/IHiveService/GetResourceIdResponse")]
         System.Guid GetResourceId(string resourceName);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/TriggerLifecycle", ReplyAction="http://tempuri.org/IHiveService/TriggerLifecycleResponse")]
-        void TriggerLifecycle(bool force);
     }
     
@@ -1906 +1909 @@
         }
         
+        public void TriggerLifecycle(bool force)
+        {
+            base.Channel.TriggerLifecycle(force);
+        }
+        
         public System.Guid AddAppointment(HeuristicLab.Clients.Hive.Appointment appointment)
         {
@@ -1956 +1964 @@
         }
         
+        public System.Collections.Generic.List<HeuristicLab.Clients.Hive.LightweightJob> GetLightweightExperimentJobs(System.Guid experimentId)
+        {
+            return base.Channel.GetLightweightExperimentJobs(experimentId);
+        }
+        
         public HeuristicLab.Clients.Hive.JobData GetJobData(System.Guid jobId)
         {
@@ -2130 +2143 @@
             return base.Channel.GetResourceId(resourceName);
         }
-        
-        public void TriggerLifecycle(bool force)
-        {
-            base.Channel.TriggerLifecycle(force);
-        }
     }
 }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceClients/Job.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using HeuristicLab.Common;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Clients.Hive {
-
   public partial class Job : LightweightJob {
 
@@ -38 +38 @@
       this.IsParentJob = original.IsParentJob;
       this.FinishWhenChildJobsFinished = original.FinishWhenChildJobsFinished;
+      this.HiveExperimentId = original.HiveExperimentId;
     }
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceClients/LightweightJob.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.Clients.Hive {
-
   public partial class LightweightJob : IDeepCloneable, IContent {
     public StateLog CurrentStateLog { get { return StateLog.LastOrDefault(); } }

@@ -4 +4 @@
 PrecompiledWeb
 CreateEventLogSources
+WindowsFormsTestProject