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

Timestamp:

06/08/11 00:04:16 (13 years ago)

Author:

cneumuel

Message:

#1233

• locking for childHiveJobs in OptimizerHiveJob avoid multi threaded access issues
• added IsPrivileged to gui
• minor changes

Location:

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

Files:

• HiveEngine.cs (modified) (8 diffs)
• Tests (modified) (1 prop)
• Tests/Program.cs (modified) (1 diff)

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

@@ -74 +74 @@
     }
 
+    [Storable]
+    private bool isPrivileged;
+    public bool IsPrivileged {
+      get { return isPrivileged; }
+      set { isPrivileged = value; }
+    }
+
     // [Storable] -> HiveExperiment can't be storable, so RefreshableHiveExperiment can't be stored
     private ItemCollection<RefreshableHiveExperiment> hiveExperiments = new ItemCollection<RefreshableHiveExperiment>();
@@ -108 +115 @@
       this.executionTimeOnHive = original.executionTimeOnHive;
       this.useLocalPlugins = original.useLocalPlugins;
+      this.IsPrivileged = original.IsPrivileged;
       // this.hiveExperiments = cloner.Clone(original.hiveExperiments); do not clone hiveExperiments - otherwise they would be sent with every job
     }
@@ -187 +195 @@
           //  }
           //} else if (coll.Parallel) {
-          if(coll.Parallel) {
+          if (coll.Parallel) {
             // 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
             IScope parentScopeClone = (IScope)((IAtomicOperation)coll.First()).Scope.Parent.Clone();
@@ -272 +280 @@
       IScope[] scopes = new Scope[jobs.Length];
       object locker = new object();
-      IDictionary<Guid, int> jobIndices = new Dictionary<Guid, int>();
       var hiveExperiment = refreshableHiveExperiment.HiveExperiment;
 
       try {
-        List<Guid> remainingJobIds = new List<Guid>();
-
         // create upload-tasks
-        var uploadTasks = new List<Task<Job>>();
         for (int i = 0; i < jobs.Length; i++) {
-          hiveExperiment.HiveJobs.Add(new EngineHiveJob(jobs[i], parentScopeClone));
+          var engineHiveJob = new EngineHiveJob(jobs[i], parentScopeClone);
+          engineHiveJob.Job.Priority = this.Priority;
+          hiveExperiment.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)
@@ -288 +294 @@
             random.Reset(random.Next());
         }
-        HiveClient.StartExperiment((e) => {
-          LogException(e);
-        }, refreshableHiveExperiment);
+        HiveClient.StartExperiment((e) => { LogException(e); }, refreshableHiveExperiment);
 
         // do polling until experiment is finished and all jobs are downloaded
         while (!refreshableHiveExperiment.AllJobsFinished()) {
-          Thread.Sleep(500);
+          Thread.Sleep(2000);
           this.ExecutionTimeOnHive = TimeSpan.FromMilliseconds(hiveExperiments.Sum(x => x.HiveExperiment.ExecutionTime.TotalMilliseconds));
           cancellationToken.ThrowIfCancellationRequested();
         }
         LogMessage(string.Format("{0} finished (TotalExecutionTime: {1}).", refreshableHiveExperiment.ToString(), refreshableHiveExperiment.HiveExperiment.ExecutionTime));
+
+        var failedJobs = hiveExperiment.HiveJobs.Where(x => x.Job.State == JobState.Failed);
+        if(failedJobs.Count() > 0) {
+          throw new HiveEngineException("Job failed: " + failedJobs.First().Job.StateLog.Last().Exception);
+        }
 
         // get scopes
         int j = 0;
         foreach (var hiveJob in hiveExperiment.HiveJobs) {
-          if (hiveJob.Job.State != JobState.Finished)
-            throw new HiveEngineException("Job failed: " + hiveJob.Job.StateLog.Last().Exception);
-
           var scope = ((IAtomicOperation)((EngineJob)hiveJob.ItemJob).InitialOperation).Scope;
           scopes[j++] = scope;
@@ -313 +319 @@
       catch (OperationCanceledException e) {
         lock (locker) {
-          if (jobIndices != null) DeleteHiveExperiment(hiveExperiment.Id);
+          DeleteHiveExperiment(hiveExperiment.Id);
         }
         throw e;
@@ -319 +325 @@
       catch (Exception e) {
         lock (locker) {
-          if (jobIndices != null) DeleteHiveExperiment(hiveExperiment.Id);
+          DeleteHiveExperiment(hiveExperiment.Id);
         }
         LogException(e);
@@ -333 +339 @@
         hiveExperiment.UseLocalPlugins = this.UseLocalPlugins;
         hiveExperiment.ResourceNames = this.ResourceNames;
+        hiveExperiment.IsPrivileged = this.IsPrivileged;
         var refreshableHiveExperiment = new RefreshableHiveExperiment(hiveExperiment);
         refreshableHiveExperiment.IsControllable = false;

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

@@ -5 +5 @@
 HeuristicLab.HiveEngine-3.4.Tests.csproj.vs10x
 Meta-GA - Meta Optimization Problem (Genetic Programming - Symbolic Regression 3.4 scaled)_small.hl
+HeuristicLab.HiveEngine-3.4.ConsoleTests.csproj.user
+HeuristicLab.HiveEngine-3.4.ConsoleTests.csproj.vs10x

@@ -5 +5 @@
 HeuristicLab.HiveEngine-3.4.Tests.csproj.vs10x
 Meta-GA - Meta Optimization Problem (Genetic Programming - Symbolic Regression 3.4 scaled)_small.hl
+HeuristicLab.HiveEngine-3.4.ConsoleTests.csproj.user
+HeuristicLab.HiveEngine-3.4.ConsoleTests.csproj.vs10x

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

@@ -47 +47 @@
       GeneticAlgorithm alg = new GeneticAlgorithm();
       alg.Problem = new SingleObjectiveTestFunctionProblem();
-      alg.Engine = new HiveEngine() { ResourceNames = "CHRISTOPH-PC" };
+      alg.Engine = new HiveEngine() { ResourceNames = "HEAL" };
       alg.Elites.Value = 0;
       alg.PopulationSize.Value = 10;

@@ -5 +5 @@
 HeuristicLab.HiveEngine-3.4.Tests.csproj.vs10x
 Meta-GA - Meta Optimization Problem (Genetic Programming - Symbolic Regression 3.4 scaled)_small.hl
+HeuristicLab.HiveEngine-3.4.ConsoleTests.csproj.user
+HeuristicLab.HiveEngine-3.4.ConsoleTests.csproj.vs10x