Changeset 6725 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine

Timestamp:

09/08/11 16:38:28 (13 years ago)

Author:

ascheibe

Message:

#1233 more renaming for more consistency

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.3

Files:

• HiveEngine.cs (modified) (6 diffs)
• Tests/Program.cs (modified) (2 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.3/HiveEngine.cs

@@ -73 +73 @@
     }
 
-    // Job can't be storable, so RefreshableHiveExperiment can't be stored. But as previous runs are only informative it does not matter (only execution time on hive will be wrong because of that -> Todo)
-    private ItemCollection<RefreshableHiveExperiment> hiveExperiments = new ItemCollection<RefreshableHiveExperiment>();
-    public ItemCollection<RefreshableHiveExperiment> HiveExperiments {
-      get { return hiveExperiments; }
-      set { hiveExperiments = value; }
+    // Task can't be storable, so RefreshableHiveExperiment can't be stored. But as previous runs are only informative it does not matter (only execution time on hive will be wrong because of that -> Todo)
+    private ItemCollection<RefreshableJob> jobs = new ItemCollection<RefreshableJob>();
+    public ItemCollection<RefreshableJob> Jobs {
+      get { return jobs; }
+      set { jobs = value; }
     }
 
@@ -111 +111 @@
       this.executionTimeOnHive = original.executionTimeOnHive;
       this.IsPrivileged = original.IsPrivileged;
-      // do not clone hiveExperiments - otherwise they would be sent with every job
+      // do not clone jobs - otherwise they would be sent with every task
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -158 +158 @@
           if (coll.Parallel) {
             try {
-              // clone the parent scope here and reuse it for each operation. otherwise for each job the whole scope-tree first needs to be copied and then cleaned, which causes a lot of work for the Garbage Collector
+              // clone the parent scope here and reuse it for each operation. otherwise for each task the whole scope-tree first needs to be copied and then cleaned, which causes a lot of work for the Garbage Collector
               IScope parentScopeClone = (IScope)((IAtomicOperation)coll.First()).Scope.Parent.Clone();
               parentScopeClone.SubScopes.Clear();
               parentScopeClone.ClearParentScopes();
 
-              EngineJob[] jobs = new EngineJob[coll.Count];
+              EngineTask[] jobs = new EngineTask[coll.Count];
               for (int i = 0; i < coll.Count; i++) {
-                jobs[i] = new EngineJob(coll[i], new SequentialEngine.SequentialEngine());
+                jobs[i] = new EngineTask(coll[i], new SequentialEngine.SequentialEngine());
               }
 
-              var experiment = CreateHiveExperiment();
+              var experiment = CreateJob();
               IScope[] scopes = ExecuteOnHive(experiment, jobs, parentScopeClone, cancellationToken);
 
@@ -241 +241 @@
     /// </summary>
     /// <param name="jobs"></param>
-    private IScope[] ExecuteOnHive(RefreshableHiveExperiment refreshableHiveExperiment, EngineJob[] jobs, IScope parentScopeClone, CancellationToken cancellationToken) {
+    private IScope[] ExecuteOnHive(RefreshableJob refreshableJob, EngineTask[] jobs, IScope parentScopeClone, CancellationToken cancellationToken) {
       log.LogMessage(string.Format("Executing {0} operations on the hive.", jobs.Length));
       IScope[] scopes = new Scope[jobs.Length];
       object locker = new object();
-      var hiveExperiment = refreshableHiveExperiment.HiveExperiment;
+      var hiveExperiment = refreshableJob.Job;
 
       try {
         // create upload-tasks
         for (int i = 0; i < jobs.Length; i++) {
-          var engineHiveJob = new EngineHiveJob(jobs[i], parentScopeClone);
-          engineHiveJob.Job.Priority = this.Priority;
-          refreshableHiveExperiment.HiveJobs.Add(engineHiveJob);
+          var engineHiveJob = new EngineHiveTask(jobs[i], parentScopeClone);
+          engineHiveJob.Task.Priority = this.Priority;
+          refreshableJob.HiveJobs.Add(engineHiveJob);
 
           // shuffle random variable to avoid the same random sequence in each operation; todo: does not yet work (it cannot find the random variable)
@@ -259 +259 @@
             random.Reset(random.Next());
         }
-        HiveClient.StartExperiment((e) => { log.LogException(e); }, refreshableHiveExperiment, cancellationToken);
+        HiveClient.StartExperiment((e) => { log.LogException(e); }, refreshableJob, cancellationToken);
 
         // do polling until experiment is finished and all jobs are downloaded
-        while (!refreshableHiveExperiment.AllJobsFinished()) {
+        while (!refreshableJob.AllJobsFinished()) {
           Thread.Sleep(2000);
-          this.ExecutionTimeOnHive = TimeSpan.FromMilliseconds(hiveExperiments.Sum(x => x.ExecutionTime.TotalMilliseconds));
+          this.ExecutionTimeOnHive = TimeSpan.FromMilliseconds(jobs.Sum(x => x.ExecutionTime.TotalMilliseconds));
           cancellationToken.ThrowIfCancellationRequested();
         }
-        log.LogMessage(string.Format("{0} finished (TotalExecutionTime: {1}).", refreshableHiveExperiment.ToString(), refreshableHiveExperiment.ExecutionTime));
-
-        var failedJobs = refreshableHiveExperiment.HiveJobs.Where(x => x.Job.State == TaskState.Failed);
+        log.LogMessage(string.Format("{0} finished (TotalExecutionTime: {1}).", refreshableJob.ToString(), refreshableJob.ExecutionTime));
+
+        var failedJobs = refreshableJob.HiveJobs.Where(x => x.Task.State == TaskState.Failed);
         if (failedJobs.Count() > 0) {
-          throw new HiveEngineException("Task failed: " + failedJobs.First().Job.StateLog.Last().Exception);
+          throw new HiveEngineException("Task failed: " + failedJobs.First().Task.StateLog.Last().Exception);
         }
 
         // get scopes
         int j = 0;
-        foreach (var hiveJob in refreshableHiveExperiment.HiveJobs) {
-          var scope = ((IAtomicOperation)((EngineJob)hiveJob.ItemJob).InitialOperation).Scope;
+        foreach (var hiveJob in refreshableJob.HiveJobs) {
+          var scope = ((IAtomicOperation)((EngineTask)hiveJob.ItemTask).InitialOperation).Scope;
           scopes[j++] = scope;
         }
@@ -290 +290 @@
       }
       finally {
-        DisposeHiveExperiment(refreshableHiveExperiment);
-      }
-    }
-
-    private RefreshableHiveExperiment CreateHiveExperiment() {
+        DisposeJob(refreshableJob);
+      }
+    }
+
+    private RefreshableJob CreateJob() {
       lock (locker) {
         var hiveExperiment = new Job();
-        hiveExperiment.Name = "HiveEngine Run " + hiveExperiments.Count;
+        hiveExperiment.Name = "HiveEngine Run " + jobs.Count;
         hiveExperiment.DateCreated = DateTime.Now;
         hiveExperiment.ResourceNames = this.ResourceNames;
         hiveExperiment.IsPrivileged = this.IsPrivileged;
-        var refreshableHiveExperiment = new RefreshableHiveExperiment(hiveExperiment);
+        var refreshableHiveExperiment = new RefreshableJob(hiveExperiment);
         refreshableHiveExperiment.IsDownloadable = false; // download happens automatically so disable button
-        hiveExperiments.Add(refreshableHiveExperiment);
+        jobs.Add(refreshableHiveExperiment);
         return refreshableHiveExperiment;
       }
     }
 
-    private void DisposeHiveExperiment(RefreshableHiveExperiment refreshableHiveExperiment) {
-      refreshableHiveExperiment.RefreshAutomatically = false;
-      DeleteHiveExperiment(refreshableHiveExperiment.HiveExperiment.Id);
-      ClearData(refreshableHiveExperiment);
-    }
-
-    private void ClearData(RefreshableHiveExperiment refreshableHiveExperiment) {
-      var jobs = refreshableHiveExperiment.GetAllHiveJobs();
+    private void DisposeJob(RefreshableJob refreshableJob) {
+      refreshableJob.RefreshAutomatically = false;
+      DeleteHiveExperiment(refreshableJob.Job.Id);
+      ClearData(refreshableJob);
+    }
+
+    private void ClearData(RefreshableJob refreshableJob) {
+      var jobs = refreshableJob.GetAllHiveJobs();
       foreach (var job in jobs) {
         job.ClearData();

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.3/Tests/Program.cs

@@ -33 +33 @@
       ContentManager.Initialize(new PersistenceContentManager());
 
-      OptimizerJob job = new OptimizerJob(new Experiment());
+      OptimizerTask job = new OptimizerTask(new Experiment());
       job.IndexInParentOptimizerList = 15;
 
-      //byte[] data = PersistenceUtil.Serialize(job);
+      //byte[] data = PersistenceUtil.Serialize(task);
 
       //var job2 = PersistenceUtil.Deserialize<OptimizerJob>(data);
@@ -66 +66 @@
         Console.WriteLine("Log:");
         Console.WriteLine(string.Join(Environment.NewLine, alg.Engine.Log.Messages.ToArray()));
-        var exps = ((HiveEngine)alg.Engine).HiveExperiments;
+        var exps = ((HiveEngine)alg.Engine).Jobs;
         foreach (var exp in exps) {
           Console.WriteLine("# " + exp.ToString());