Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
11/29/12 09:57:15 (12 years ago)
Author:
abeham
Message:

#1985: Synchronized with trunk

Location:
branches/RuntimeOptimizer
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/RuntimeOptimizer

  • branches/RuntimeOptimizer/HeuristicLab.Optimization/3.3/Algorithms/Algorithm.cs

    r8738 r8971  
    134134      storeAlgorithmInEachRun = false;
    135135      runsCounter = 0;
    136       Runs = new RunCollection { AlgorithmName = Name };
     136      Runs = new RunCollection { OptimizerName = Name };
    137137    }
    138138    protected Algorithm(string name)
    … …  
    142142      storeAlgorithmInEachRun = false;
    143143      runsCounter = 0;
    144       Runs = new RunCollection { AlgorithmName = Name };
     144      Runs = new RunCollection { OptimizerName = Name };
    145145    }
    146146    protected Algorithm(string name, ParameterCollection parameters)
    … …  
    150150      storeAlgorithmInEachRun = false;
    151151      runsCounter = 0;
    152       Runs = new RunCollection { AlgorithmName = Name };
     152      Runs = new RunCollection { OptimizerName = Name };
    153153    }
    154154    protected Algorithm(string name, string description)
    … …  
    158158      storeAlgorithmInEachRun = false;
    159159      runsCounter = 0;
    160       Runs = new RunCollection { AlgorithmName = Name };
     160      Runs = new RunCollection { OptimizerName = Name };
    161161    }
    162162    protected Algorithm(string name, string description, ParameterCollection parameters)
    … …  
    166166      storeAlgorithmInEachRun = false;
    167167      runsCounter = 0;
    168       Runs = new RunCollection { AlgorithmName = Name };
     168      Runs = new RunCollection { OptimizerName = Name };
    169169    }
    170170    [StorableConstructor]
    … …  
    252252    protected override void OnNameChanged() {
    253253      base.OnNameChanged();
    254       Runs.AlgorithmName = Name;
     254      Runs.OptimizerName = Name;
    255255    }
    256256

  • branches/RuntimeOptimizer/HeuristicLab.Optimization/3.3/RunCollection.cs

    r8738 r8971  
    4444      : base(original, cloner) {
    4545      updateOfRunsInProgress = false;
    46       algorithmName = original.algorithmName;
     46      optimizerName = original.optimizerName;
    4747
    4848      resultNames = new List<string>(original.resultNames);
    … …  
    106106    }
    107107
    108     private string algorithmName = string.Empty;
    109     [Storable]
    110     public string AlgorithmName {
    111       get { return algorithmName; }
     108    private string optimizerName = string.Empty;
     109    [Storable]
     110    public string OptimizerName {
     111      get { return optimizerName; }
    112112      set {
    113         if (value != algorithmName && !string.IsNullOrEmpty(value)) {
    114           algorithmName = value;
    115           OnAlgorithmNameChanged();
     113        if (value != optimizerName && !string.IsNullOrEmpty(value)) {
     114          optimizerName = value;
     115          OnOptimizerNameChanged();
    116116        }
    117117      }
    118118    }
     119
     120    // BackwardsCompatibility3.3
     121    #region Backwards compatible code, remove with 3.4
     122    [Storable(AllowOneWay = true)]
     123    private string AlgorithmName {
     124      set { optimizerName = value; }
     125    }
     126    #endregion
    119127
    120128    [StorableHook(HookType.AfterDeserialization)]
    … …  
    137145    }
    138146
    139     public event EventHandler AlgorithmNameChanged;
    140     protected virtual void OnAlgorithmNameChanged() {
    141       var handler = AlgorithmNameChanged;
     147    public event EventHandler OptimizerNameChanged;
     148    protected virtual void OnOptimizerNameChanged() {
     149      var handler = OptimizerNameChanged;
    142150      if (handler != null) handler(this, EventArgs.Empty);
    143151    }
Note: See TracChangeset for help on using the changeset viewer.