Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
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/HeuristicLab.Hive.ExperimentManager/3.3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager/3.3/HiveJob.cs

    r5294 r5309  
    178178        } else if (Job.Optimizer is Optimization.BatchRun) {
    179179          Optimization.BatchRun batchRun = Job.OptimizerAsBatchRun;
    180           if (batchRun.Algorithm != null) {
     180          if (batchRun.Optimizer != null) {
    181181            while (this.childHiveJobs.Count < batchRun.Repetitions) {
    182               this.childHiveJobs.Add(new HiveJob(batchRun.Algorithm));
     182              this.childHiveJobs.Add(new HiveJob(batchRun.Optimizer));
    183183            }
    184184            while (this.childHiveJobs.Count > batchRun.Repetitions) {
     
    201201          Optimization.BatchRun batchRun = Job.OptimizerAsBatchRun;
    202202          batchRun.RepetitionsChanged += new EventHandler(batchRun_RepetitionsChanged);
    203           batchRun.AlgorithmChanged += new EventHandler(batchRun_AlgorithmChanged);
     203          batchRun.OptimizerChanged += new EventHandler(batchRun_OptimizerChanged);
    204204        }
    205205
     
    219219          Optimization.BatchRun batchRun = Job.OptimizerAsBatchRun;
    220220          batchRun.RepetitionsChanged -= new EventHandler(batchRun_RepetitionsChanged);
    221           batchRun.AlgorithmChanged -= new EventHandler(batchRun_AlgorithmChanged);
     221          batchRun.OptimizerChanged -= new EventHandler(batchRun_OptimizerChanged);
    222222        }
    223223
     
    227227    }
    228228
    229     void batchRun_AlgorithmChanged(object sender, EventArgs e) {
     229    void batchRun_OptimizerChanged(object sender, EventArgs e) {
    230230      if (syncJobsWithOptimizers) {
    231231        this.childHiveJobs.Clear();
     
    311311    ///   replace the child-optimizer in the experiment
    312312    /// if this.Optimizer is BatchRun
    313     ///   add the runs from the optimizerJob to the batchrun and replace the algorithm
     313    ///   add the runs from the optimizerJob to the batchrun and replace the Optimizer
    314314    /// </summary>
    315315    public void UpdateChildOptimizer(OptimizerJob optimizerJob, Guid childJobId) {
     
    344344
    345345    /// <summary>
    346     /// Adds the runs from the optimizerJob to the batchrun and replaces the algorithm
     346    /// Adds the runs from the optimizerJob to the batchrun and replaces the Optimizer
    347347    /// Sideeffect: the optimizerJob.Optimizer will be prepared (scopes are deleted and executionstate will be reset)
    348348    /// </summary>
    349349    private void UpdateOptimizerInBatchRun(BatchRun batchRun, OptimizerJob optimizerJob) {
    350       if (batchRun.Algorithm == null) {
    351         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
     350      if (batchRun.Optimizer == null) {
     351        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
    352352      }
    353353      foreach (IRun run in optimizerJob.Optimizer.Runs) {
     
    441441      } else if (withoutChildOptimizers && this.Job.Optimizer is Optimization.BatchRun) {
    442442        OptimizerJob clonedJob = (OptimizerJob)this.Job.Clone();
    443         clonedJob.OptimizerAsBatchRun.Algorithm = null;
     443        clonedJob.OptimizerAsBatchRun.Optimizer = null;
    444444        jobByteArray = SerializedJob.Serialize(clonedJob);
    445445      } else if (this.Job.Optimizer is IAlgorithm) {
  • branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager/3.3/Jobs/OptimizerJob.cs

    r5213 r5309  
    147147    public virtual void Start() {
    148148      if ((optimizer is Optimization.Experiment && OptimizerAsExperiment.Optimizers.Count == 0) || // experiment would not fire OnStopped if it has 0 optimizers
    149           (optimizer is Optimization.BatchRun && OptimizerAsBatchRun.Algorithm == null)) { // batchrun would not fire OnStopped if algorithm == null
     149          (optimizer is Optimization.BatchRun && OptimizerAsBatchRun.Optimizer == null)) { // batchrun would not fire OnStopped if algorithm == null
    150150        OnJobStopped();
    151151      } else {
Note: See TracChangeset for help on using the changeset viewer.