Changeset 4120 for branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment

Timestamp:

07/29/10 16:58:35 (14 years ago)

Author:

cneumuel

Message:

further improvement and stabilisation of HiveExperiment (#1115)

Location:

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3

Files:

• . (modified) (1 prop)
• HeuristicLab.Hive.Experiment-3.3.csproj (modified) (1 diff)
• HeuristicLab.Hive.Experiment-3.3.csproj.user (deleted)
• HiveExperiment.cs (modified) (21 diffs)
• JobItem.cs (added)
• JobItemList.cs (added)
• OptimizerJob.cs (modified) (1 diff)
• Properties/AssemblyInfo.cs (modified) (1 diff)
• ServiceLocator.cs (modified) (1 diff)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3

@@ -1 +1 @@
 bin
 obj
+HeuristicLab.Hive.Experiment-3.3.csproj.user

@@ -1 +1 @@
 bin
 obj
+HeuristicLab.Hive.Experiment-3.3.csproj.user

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/HeuristicLab.Hive.Experiment-3.3.csproj

@@ -96 +96 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="JobItemList.cs" />
+    <Compile Include="JobItem.cs" />
     <Compile Include="OptimizerJob.cs" />
     <Compile Include="HeuristicLabHiveExperimentPlugin.cs" />

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/HiveExperiment.cs

@@ -54 +54 @@
     private const int resultPollingIntervalMs = 10000;
 
+    private object locker = new object();
     private const int maxSnapshotRetries = 20;
-
-    [Storable]
-    private IDictionary<Guid, IOptimizer> sentOptimizers = null;
-
-    private object locker = new object();
-    private DateTime startTime;
+    private System.Timers.Timer timer;
+    private bool pausePending, stopPending;
+    private DateTime lastUpdateTime;
+
+    [Storable]
+    private IDictionary<Guid, IOptimizer> pendingOptimizers = new Dictionary<Guid, IOptimizer>();
+
+    [Storable]
+    private JobItemList jobItems;
+    public JobItemList JobItems {
+      get { return jobItems; }
+    }
+    
 
     [Storable]
@@ -66 +74 @@
     public string ServerUrl {
       get { return serverUrl; }
-      set { serverUrl = value; OnServerUrlChanged(); }
+      set {
+        if (serverUrl != value) {
+          serverUrl = value; 
+          OnServerUrlChanged();
+        }
+      }
     }
 
@@ -73 +86 @@
     public string ResourceIds {
       get { return resourceIds; }
-      set { resourceIds = value; OnResourceIdsChanged(); }
+      set {
+        if (resourceIds != value) {
+          resourceIds = value; 
+          OnResourceIdsChanged();
+        }
+      }
     }
 
@@ -80 +98 @@
     public HeuristicLab.Optimization.Experiment Experiment {
       get { return experiment; }
-      set { experiment = value; OnExperimentChanged(); }
+      set {
+        if (experiment != value) {
+          experiment = value;
+          OnExperimentChanged();
+        }
+      }
+    }
+
+    [Storable]
+    private ILog log;
+    public ILog Log {
+      get { return log; }
     }
 
@@ -92 +121 @@
       this.ServerUrl = HeuristicLab.Hive.Experiment.Properties.Settings.Default.HiveServerUrl;
       this.ResourceIds = HeuristicLab.Hive.Experiment.Properties.Settings.Default.ResourceIds;
+      this.log = new Log();
+      pausePending = stopPending = false;
+      jobItems = new JobItemList();
+      InitTimer();
     }
 
     public override IDeepCloneable Clone(Cloner cloner) {
+      log.LogMessage("I am beeing cloned");
       HiveExperiment clone = (HiveExperiment)base.Clone(cloner);
       clone.resourceIds = this.resourceIds;
@@ -101 +135 @@
       clone.executionState = this.executionState;
       clone.executionTime = this.executionTime;
-      clone.sentOptimizers = new Dictionary<Guid, IOptimizer>();
-      foreach (var pair in this.sentOptimizers)
-        clone.sentOptimizers[pair.Key] = (IOptimizer)cloner.Clone(pair.Value);
+      clone.pendingOptimizers = new Dictionary<Guid, IOptimizer>();
+      foreach (var pair in this.pendingOptimizers)
+        clone.pendingOptimizers[pair.Key] = (IOptimizer)cloner.Clone(pair.Value);
+      clone.log = (ILog)cloner.Clone(log);
+      clone.stopPending = this.stopPending;
+      clone.pausePending = this.pausePending;
+      clone.jobItems = (JobItemList)cloner.Clone(jobItems);
       return clone;
+    }
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      InitTimer();
+      log.LogMessage("I was deserialized.");
+    }
+
+    private void InitTimer() {
+      timer = new System.Timers.Timer(100);
+      timer.AutoReset = true;
+      timer.Elapsed += new System.Timers.ElapsedEventHandler(timer_Elapsed);
+    }
+
+    private void timer_Elapsed(object sender, System.Timers.ElapsedEventArgs e) {
+      DateTime now = DateTime.Now;
+      ExecutionTime += now - lastUpdateTime;
+      lastUpdateTime = now;
     }
 
@@ -135 +191 @@
       get { return executionTime; }
       private set {
-        executionTime = value;
-        OnExecutionTimeChanged();
+        if (executionTime != value) {
+          executionTime = value;
+          OnExecutionTimeChanged();
+        }
       }
     }
@@ -145 +203 @@
 
     public void Prepare() {
-      // [chn] needed?
       if (experiment != null) {
         experiment.Prepare();
+        this.ExecutionState = Core.ExecutionState.Prepared;
         OnPrepared();
       }
@@ -153 +211 @@
 
     public void Start() {
-      this.startTime = DateTime.Now;
+      OnStarted();
+      lastUpdateTime = DateTime.Now;
       this.ExecutionState = Core.ExecutionState.Started;
-      IExecutionEngineFacade executionEngineFacade = ServiceLocator.CreateExecutionEngineFacade(ServerUrl);
-
-      sentOptimizers = new Dictionary<Guid, IOptimizer>();
-      IEnumerable<string> groups = ResourceGroups;
-
-      foreach (IOptimizer optimizer in Experiment.Optimizers) {
-        SerializedJob serializedJob = CreateSerializedJob(optimizer);
-        ResponseObject<JobDto> response = executionEngineFacade.AddJobWithGroupStrings(serializedJob, groups);
-        sentOptimizers.Add(response.Obj.Id, optimizer);
-        StartResultPollingThread(response.Obj);
-      }
+      Thread t = new Thread(() => {
+        IExecutionEngineFacade executionEngineFacade = ServiceLocator.CreateExecutionEngineFacade(ServerUrl);
+
+        pendingOptimizers = new Dictionary<Guid, IOptimizer>();
+        IEnumerable<string> groups = ResourceGroups;
+
+        foreach (IOptimizer optimizer in GetOptimizers(false)) {
+          SerializedJob serializedJob = CreateSerializedJob(optimizer);
+          ResponseObject<JobDto> response = executionEngineFacade.AddJobWithGroupStrings(serializedJob, groups);
+          pendingOptimizers.Add(response.Obj.Id, optimizer);
+          StartResultPollingThread(response.Obj);
+
+          JobItem jobItem = new JobItem() {
+            JobDto = response.Obj,
+            LatestSnapshot = new ResponseObject<SerializedJob>() {
+              Obj = serializedJob,
+              StatusMessage = "Initial Snapshot",
+              Success = true
+            }
+          };
+          jobItems.Add(jobItem);
+
+          log.LogMessage("Sent job to server (jobId: " + response.Obj.Id + ")");
+        }
+      });
+      t.Start();
+    }
+
+    /// <summary>
+    /// Returns all optimizers in the current Experiment
+    /// </summary>
+    /// <param name="flatout">if false only top level optimizers are returned, if true the optimizer-tree is flatted</param>
+    /// <returns></returns>
+    private IEnumerable<IOptimizer> GetOptimizers(bool flatout) {
+      if (!flatout) {
+        return experiment.Optimizers;
+      } else {
+        throw new NotImplementedException();
+      }
+    }
+
+    private void ReplaceOptimizer(IOptimizer originalOptimizer, IOptimizer newOptimizer) {
+      int originalOptimizerIndex = experiment.Optimizers.IndexOf(originalOptimizer);
+      experiment.Optimizers[originalOptimizerIndex] = newOptimizer;
     }
 
@@ -171 +263 @@
       // todo
     }
-
-    private bool abortRequested;
-
+    
     #endregion
 
@@ -219 +309 @@
           Thread.Sleep(resultPollingIntervalMs);
           lock (locker) {
-            if (abortRequested) return;
-
+            if (stopPending) return;
+            
             ResponseObject<SerializedJob> response = executionEngineFacade.GetLastSerializedResult(job.Id, false, false);
-
+            log.LogMessage("Received response for job: " + response.StatusMessage + " (jobId: " + job.Id + ")");
+            
+            
             // loop while 
             // 1. the user doesn't request an abort 
@@ -229 +321 @@
             // 4. the result that we get from the server is a snapshot and not the final result
             if (response.Success && response.Obj != null && response.StatusMessage != ApplicationConstants.RESPONSE_JOB_RESULT_NOT_YET_HERE) {
-
-              // [chn] todo: deserialization into interface is not possible! how to find out correct static type?
               restoredObject = XmlParser.Deserialize<IJob>(new MemoryStream(response.Obj.SerializedJobData));
             }
@@ -236 +326 @@
         } while (restoredObject == null || restoredObject.ExecutionState != Core.ExecutionState.Stopped);
 
+        log.LogMessage("Job finished (jobId: " + job.Id + ")");
         // job retrieved... replace the existing optimizers with the finished one
-        IOptimizer originalOptimizer = sentOptimizers[job.Id];
+        IOptimizer originalOptimizer = pendingOptimizers[job.Id];
         IOptimizer restoredOptimizer = ((OptimizerJob)restoredObject).Optimizer;
 
-        int originalOptimizerIndex = experiment.Optimizers.IndexOf(originalOptimizer);
-        experiment.Optimizers[originalOptimizerIndex] = restoredOptimizer;
-        sentOptimizers.Remove(job.Id);
-
-        if (sentOptimizers.Count == 0) {
+        ReplaceOptimizer(originalOptimizer, restoredOptimizer);
+        pendingOptimizers.Remove(job.Id);
+
+        if (pendingOptimizers.Count == 0) {
           // finished
           this.ExecutionState = Core.ExecutionState.Stopped;
@@ -254 +344 @@
       t.Start();
     }
-
-
+    
     #region Required Plugin Search
     /// <summary>
@@ -351 +440 @@
     public event EventHandler ExecutionStateChanged;
     private void OnExecutionStateChanged() {
+      log.LogMessage("ExecutionState changed to " + executionState.ToString());
       EventHandler handler = ExecutionStateChanged;
       if (handler != null) handler(this, EventArgs.Empty);
@@ -359 +449 @@
     public event EventHandler Started;
     private void OnStarted() {
+      log.LogMessage("Started");
+      timer.Start();
       EventHandler handler = Started;
       if (handler != null) handler(this, EventArgs.Empty);
@@ -365 +457 @@
     public event EventHandler Stopped;
     private void OnStopped() {
+      timer.Stop();
+      log.LogMessage("Stopped");
       EventHandler handler = Stopped;
       if (handler != null) handler(this, EventArgs.Empty);
@@ -371 +465 @@
     public event EventHandler Paused;
     private void OnPaused() {
+      timer.Stop();
+      log.LogMessage("Paused");
       EventHandler handler = Paused;
       if (handler != null) handler(this, EventArgs.Empty);
@@ -377 +473 @@
     public event EventHandler Prepared;
     protected virtual void OnPrepared() {
+      log.LogMessage("Prepared");
       EventHandler handler = Prepared;
       if (handler != null) handler(this, EventArgs.Empty);
@@ -389 +486 @@
     public event EventHandler ExperimentChanged;
     protected virtual void OnExperimentChanged() {
+      log.LogMessage("Experiment changed");
       EventHandler handler = ExperimentChanged;
       if (handler != null) handler(this, EventArgs.Empty);
@@ -399 +497 @@
     }
 
-
     #endregion
   }

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/OptimizerJob.cs

@@ -10 +10 @@
 namespace HeuristicLab.Hive.Experiment {
   [StorableClass]
-  class OptimizerJob : IJob {
+  public class OptimizerJob : IJob {
 
     [Storable]

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/Properties/AssemblyInfo.cs

@@ -55 +55 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("3.3.0.4116")]
-[assembly: AssemblyFileVersion("3.3.0.4116")]
-[assembly: AssemblyBuildDate("2010/07/28 17:42:02")]
+[assembly: AssemblyVersion("3.3.0.4119")]
+[assembly: AssemblyFileVersion("3.3.0.4119")]
+[assembly: AssemblyBuildDate("2010/07/29 16:49:01")]

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/ServiceLocator.cs

@@ -31 +31 @@
   internal class ServiceLocator {
     internal static IExecutionEngineFacade CreateExecutionEngineFacade(string url) {
-      ChannelFactory<IExecutionEngineFacade> factory =
-        new ChannelFactory<IExecutionEngineFacade>(
+      ChannelFactory<IExecutionEngineFacade> factory = new ChannelFactory<IExecutionEngineFacade>(
           WcfSettings.GetStreamedBinding(),
           new EndpointAddress(url));
-
       return factory.CreateChannel();
     }

@@ -1 +1 @@
 bin
 obj
+HeuristicLab.Hive.Experiment-3.3.csproj.user