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

Timestamp:

03/16/11 17:02:15 (13 years ago)

Author:

cneumuel

Message:

#1233

• fixed statelog when time on server differs from slave or client
• fixed wrong creation of childjobs in experiment manager
• made ganttchardview the default view for statelogs

Location:

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

Files:

• ExperimentManager/HiveExperimentClient.cs (modified) (6 diffs)
• ExperimentManager/HiveJobClient.cs (modified) (4 diffs)
• HeuristicLab.Clients.Hive-3.4.csproj (modified) (1 diff)
• ServiceClients/HiveItem.cs (modified) (1 diff)
• ServiceClients/Job.cs (modified) (2 diffs)
• ServiceClients/LightweightJob.cs (modified) (2 diffs)

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

@@ -28 +28 @@
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
-using HeuristicLab.Tracing;
 
 namespace HeuristicLab.Clients.Hive {
@@ -298 +297 @@
       string configFilePath = ConfigurationManager.OpenExeConfiguration(exeFilePath).FilePath;
 
-
       Plugin configPlugin = new Plugin() {
         Name = "Configuration",
@@ -343 +341 @@
       this.progress.ProgressValue = (double)jobCount / totalJobCount;
 
-      hiveJob.Job.SetState(JobState.Transferring);
+      //service.UpdateJobState(hiveJob.Job.Id, JobState.Transferring, null, null, null);
+
       if (parentHiveJob != null) {
         hiveJob.Job.Id = service.AddChildJob(parentHiveJob.Job.Id, hiveJob.Job, jobData);
@@ -349 +348 @@
         hiveJob.Job.Id = service.AddJob(hiveJob.Job, jobData, groups.ToList());
       }
-
       LogMessage(hiveJob.Job.Id, "Job sent to Hive");
 
@@ -579 +577 @@
       lock (locker) {
         log.LogMessage(message);
-        Logger.Debug(message);
       }
     }
@@ -639 +636 @@
 
 
-        if (this.HiveJob.Job.DateFinished.HasValue) {
-          this.ExecutionTime = this.HiveJob.Job.DateFinished.Value - this.HiveJob.Job.DateCreated;
+        if (this.HiveJob.Job.DateFinished.HasValue && this.HiveJob.Job.DateCreated.HasValue) {
+          this.ExecutionTime = this.HiveJob.Job.DateFinished.Value - this.HiveJob.Job.DateCreated.Value;
           this.lastUpdateTime = this.HiveJob.Job.DateFinished.Value;
           this.ExecutionState = Core.ExecutionState.Stopped;
           OnStopped();
         } else {
-          this.ExecutionTime = DateTime.Now - this.HiveJob.Job.DateCreated;
+          this.ExecutionTime = this.HiveJob.Job.DateCreated.HasValue ? DateTime.Now - this.HiveJob.Job.DateCreated.Value : TimeSpan.Zero;
           this.lastUpdateTime = DateTime.Now;
           this.ExecutionState = Core.ExecutionState.Started;

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

@@ -108 +108 @@
         MemoryNeeded = 0
       };
-      job.SetState(JobState.Offline);
+      job.State = JobState.Offline;
       this.childHiveJobs = new ItemList<HiveJob>();
       syncJobsWithOptimizers = true;
@@ -157 +157 @@
     private void UpdateChildHiveJobs() {
       if (Job != null && syncJobsWithOptimizers) {
-        if (OptimizerJob.Optimizer is Optimization.Experiment) {
-          Optimization.Experiment experiment = (Optimization.Experiment)OptimizerJob.Optimizer;
-          foreach (IOptimizer childOpt in experiment.Optimizers) {
-            this.childHiveJobs.Add(new HiveJob(childOpt));
-          }
-        } else if (OptimizerJob.Optimizer is Optimization.BatchRun) {
-          Optimization.BatchRun batchRun = OptimizerJob.OptimizerAsBatchRun;
-          if (batchRun.Optimizer != null) {
-            while (this.childHiveJobs.Count < batchRun.Repetitions) {
-              this.childHiveJobs.Add(new HiveJob(batchRun.Optimizer));
+        if (!OptimizerJob.ComputeInParallel) {
+          this.childHiveJobs.Clear();
+        } else {
+          if (OptimizerJob.Optimizer is Optimization.Experiment) {
+            Optimization.Experiment experiment = (Optimization.Experiment)OptimizerJob.Optimizer;
+            foreach (IOptimizer childOpt in experiment.Optimizers) {
+              this.childHiveJobs.Add(new HiveJob(childOpt));
             }
-            while (this.childHiveJobs.Count > batchRun.Repetitions) {
-              this.childHiveJobs.Remove(this.childHiveJobs.Last());
+          } else if (OptimizerJob.Optimizer is Optimization.BatchRun) {
+            Optimization.BatchRun batchRun = OptimizerJob.OptimizerAsBatchRun;
+            if (batchRun.Optimizer != null) {
+              while (this.childHiveJobs.Count < batchRun.Repetitions) {
+                this.childHiveJobs.Add(new HiveJob(batchRun.Optimizer));
+              }
+              while (this.childHiveJobs.Count > batchRun.Repetitions) {
+                this.childHiveJobs.Remove(this.childHiveJobs.Last());
+              }
             }
           }
@@ -224 +228 @@
     private void batchRun_OptimizerChanged(object sender, EventArgs e) {
       if (syncJobsWithOptimizers) {
-        this.childHiveJobs.Clear();
         UpdateChildHiveJobs();
       }
@@ -277 +280 @@
     private void OptimizerJob_ComputeInParallelChanged(object sender, EventArgs e) {
       if (OptimizerJob != null && syncJobsWithOptimizers) {
-        if (OptimizerJob.ComputeInParallel) {
-          // child-hive jobs are not yet created, so create them according to the child-optimizers
-          this.UpdateChildHiveJobs();
-        } else {
-          // child-hive jobs need to be deleted
-          this.childHiveJobs.Clear();
-        }
+        this.UpdateChildHiveJobs();
       }
     }

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

@@ -96 +96 @@
     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
       <HintPath>..\..\..\..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
-    </Reference>
-    <Reference Include="HeuristicLab.Tracing-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
     </Reference>
     <Reference Include="System" />

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

@@ -30 +30 @@
   public partial class HiveItem : IItem {
 
-    public HiveItem() {
-    }
-
+    public HiveItem() { }
 
     protected HiveItem(HiveItem original, Cloner cloner) {
+      cloner.RegisterClonedObject(original, this);
       this.Id = original.Id;
     }
 
-    public IDeepCloneable Clone(Cloner cloner) {
+    public virtual IDeepCloneable Clone(Cloner cloner) {
       return new HiveItem(this, cloner);
     }

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

@@ -30 +30 @@
     public Job() { }
 
-    public void SetState(JobState state) {
-      this.State = state;
-      this.StateLog.Add(new StateLog() { State = state, DateTime = DateTime.Now });
-    }
-
-    public void SetState(JobState state, Guid userId) {
-      this.State = state;
-      this.StateLog.Add(new StateLog() { State = state, DateTime = DateTime.Now, UserId = userId });
-    }
-
-    public void SetState(JobState state, Guid slaveId, string exception) {
-      this.State = state;
-      this.StateLog.Add(new StateLog() { State = state, DateTime = DateTime.Now, SlaveId = slaveId, Exception = exception });
-    }
-
     protected Job(Job original, Cloner cloner) {
       this.Priority = original.Priority;
@@ -60 +45 @@
     }
 
-    public IDeepCloneable Clone(Cloner cloner) {
+    public override IDeepCloneable Clone(Cloner cloner) {
       return new Job(this, cloner);
     }
 
-    public object Clone() {
-      return Clone(new Cloner());
-    }
-
     public override string ToString() {
-      return string.Format("State: {0}, SlaveId: {1}, DateCreated: {2}, DateCalculated: {3}, CoresNeeded: {4}, MemoryNeeded: {5}", State, CurrentStateLog.SlaveId, DateCreated, CoresNeeded, MemoryNeeded);
+      return string.Format("State: {0}, SlaveId: {1}, DateCreated: {2}, DateCalculated: {3}, CoresNeeded: {4}, MemoryNeeded: {5}", State, CurrentStateLog.SlaveId, DateCreated.HasValue ? DateCreated.ToString() : "-", CoresNeeded, MemoryNeeded);
     }
   }

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

@@ -28 +28 @@
 
   public partial class LightweightJob : IDeepCloneable, IContent {
+    public StateLog CurrentStateLog { get { return StateLog.LastOrDefault(); } }
+    public DateTime? DateCreated { get { return StateLog.Count > 0 ? new DateTime?(StateLog.First().DateTime) : null; } }
+    public DateTime? DateFinished { get { return (StateLog.Count > 0 && CurrentStateLog.State == JobState.Finished) ? new DateTime?(CurrentStateLog.DateTime) : null; } }
 
     public LightweightJob() {
@@ -48 +51 @@
       this.Id = original.Id;
     }
-    public IDeepCloneable Clone(Cloner cloner) {
+    public override IDeepCloneable Clone(Cloner cloner) {
       return new LightweightJob(this, cloner);
-    }
-
-    public object Clone() {
-      return Clone(new Cloner());
-    }
-
-    public StateLog CurrentStateLog { get { return StateLog.Last(); } }
-    public DateTime DateCreated { get { return StateLog.First().DateTime; } }
-    public DateTime? DateFinished { get { return CurrentStateLog.State == JobState.Finished ? new DateTime?(CurrentStateLog.DateTime) : null; } }
-
-    public void SetState(JobState state) {
-      this.State = state;
-      this.StateLog.Add(new StateLog() { State = state, DateTime = DateTime.Now });
-    }
-
-    public void SetState(JobState state, Guid userId) {
-      this.State = state;
-      this.StateLog.Add(new StateLog() { State = state, DateTime = DateTime.Now, UserId = userId });
-    }
-
-    public void SetState(JobState state, Guid slaveId, string exception) {
-      this.State = state;
-      this.StateLog.Add(new StateLog() { State = state, DateTime = DateTime.Now, SlaveId = slaveId, Exception = exception });
     }
   }