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

Timestamp:

03/16/11 17:02:15 (14 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/ServiceClients

Files:

• HiveItem.cs (modified) (1 diff)
• Job.cs (modified) (2 diffs)
• LightweightJob.cs (modified) (2 diffs)

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 });
     }
   }