Changeset 5309 for branches

Timestamp:

01/17/11 12:16:40 (14 years ago)

Author:

cneumuel

Message:

#1260

• restored compatibility with changed from #1378

Location:

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

Files:

• HeuristicLab.Hive 3.3.sln (modified) (2 diffs)
• HeuristicLab.Hive.ExperimentManager/3.3/HiveJob.cs (modified) (7 diffs)
• HeuristicLab.Hive.ExperimentManager/3.3/Jobs/OptimizerJob.cs (modified) (1 diff)

branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive 3.3.sln

@@ -29 +29 @@
     ConfigMerger.exe = ConfigMerger.exe
     HeuristicLab 3.3.vsmdi = HeuristicLab 3.3.vsmdi
-    HeuristicLab.Hive 3.34.vsmdi = HeuristicLab.Hive 3.34.vsmdi
+    HeuristicLab.Hive 3.32.vsmdi = HeuristicLab.Hive 3.32.vsmdi
     LocalTestRun.testrunconfig = LocalTestRun.testrunconfig
     PreBuildEvent.cmd = PreBuildEvent.cmd
@@ -108 +108 @@
 Global
   GlobalSection(TestCaseManagementSettings) = postSolution
-    CategoryFile = HeuristicLab.Hive 3.34.vsmdi
+    CategoryFile = HeuristicLab.Hive 3.32.vsmdi
   EndGlobalSection
   GlobalSection(SolutionConfigurationPlatforms) = preSolution

branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager/3.3/HiveJob.cs

@@ -178 +178 @@
         } else if (Job.Optimizer is Optimization.BatchRun) {
           Optimization.BatchRun batchRun = Job.OptimizerAsBatchRun;
-          if (batchRun.Algorithm != null) {
+          if (batchRun.Optimizer != null) {
             while (this.childHiveJobs.Count < batchRun.Repetitions) {
-              this.childHiveJobs.Add(new HiveJob(batchRun.Algorithm));
+              this.childHiveJobs.Add(new HiveJob(batchRun.Optimizer));
             }
             while (this.childHiveJobs.Count > batchRun.Repetitions) {
@@ -201 +201 @@
           Optimization.BatchRun batchRun = Job.OptimizerAsBatchRun;
           batchRun.RepetitionsChanged += new EventHandler(batchRun_RepetitionsChanged);
-          batchRun.AlgorithmChanged += new EventHandler(batchRun_AlgorithmChanged);
+          batchRun.OptimizerChanged += new EventHandler(batchRun_OptimizerChanged);
         }
 
@@ -219 +219 @@
           Optimization.BatchRun batchRun = Job.OptimizerAsBatchRun;
           batchRun.RepetitionsChanged -= new EventHandler(batchRun_RepetitionsChanged);
-          batchRun.AlgorithmChanged -= new EventHandler(batchRun_AlgorithmChanged);
+          batchRun.OptimizerChanged -= new EventHandler(batchRun_OptimizerChanged);
         }
 
@@ -227 +227 @@
     }
 
-    void batchRun_AlgorithmChanged(object sender, EventArgs e) {
+    void batchRun_OptimizerChanged(object sender, EventArgs e) {
       if (syncJobsWithOptimizers) {
         this.childHiveJobs.Clear();
@@ -311 +311 @@
     ///   replace the child-optimizer in the experiment
     /// if this.Optimizer is BatchRun
-    ///   add the runs from the optimizerJob to the batchrun and replace the algorithm
+    ///   add the runs from the optimizerJob to the batchrun and replace the Optimizer
     /// </summary>
     public void UpdateChildOptimizer(OptimizerJob optimizerJob, Guid childJobId) {
@@ -344 +344 @@
 
     /// <summary>
-    /// Adds the runs from the optimizerJob to the batchrun and replaces the algorithm 
+    /// Adds the runs from the optimizerJob to the batchrun and replaces the Optimizer 
     /// Sideeffect: the optimizerJob.Optimizer will be prepared (scopes are deleted and executionstate will be reset)
     /// </summary>
     private void UpdateOptimizerInBatchRun(BatchRun batchRun, OptimizerJob optimizerJob) {
-      if (batchRun.Algorithm == null) {
-        batchRun.Algorithm = (IAlgorithm)optimizerJob.Optimizer; // only set the first optimizer as algorithm. if every time the Algorithm would be set, the runs would be cleared each time
+      if (batchRun.Optimizer == null) {
+        batchRun.Optimizer = optimizerJob.Optimizer; // only set the first optimizer as algorithm. if every time the Algorithm would be set, the runs would be cleared each time
       }
       foreach (IRun run in optimizerJob.Optimizer.Runs) {
@@ -441 +441 @@
       } else if (withoutChildOptimizers && this.Job.Optimizer is Optimization.BatchRun) {
         OptimizerJob clonedJob = (OptimizerJob)this.Job.Clone();
-        clonedJob.OptimizerAsBatchRun.Algorithm = null;
+        clonedJob.OptimizerAsBatchRun.Optimizer = null;
         jobByteArray = SerializedJob.Serialize(clonedJob);
       } else if (this.Job.Optimizer is IAlgorithm) {

branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager/3.3/Jobs/OptimizerJob.cs

@@ -147 +147 @@
     public virtual void Start() {
       if ((optimizer is Optimization.Experiment && OptimizerAsExperiment.Optimizers.Count == 0) || // experiment would not fire OnStopped if it has 0 optimizers
-          (optimizer is Optimization.BatchRun && OptimizerAsBatchRun.Algorithm == null)) { // batchrun would not fire OnStopped if algorithm == null
+          (optimizer is Optimization.BatchRun && OptimizerAsBatchRun.Optimizer == null)) { // batchrun would not fire OnStopped if algorithm == null
         OnJobStopped();
       } else {