Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
11/19/15 11:29:17 (9 years ago)
Author:
mkommend
Message:

#2298: Merged r13024, r13080, r13138, and r13218 into stable.

Location:
stable
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable

  • TabularUnified stable/HeuristicLab.Problems.ExternalEvaluation/3.4/Programmable/MultiObjectiveOptimizationSupportScript.cs

    r13259 r13277  
    3030  [StorableClass]
    3131  public sealed class MultiObjectiveOptimizationSupportScript : OptimizationSupportScript<IMultiObjectiveOptimizationSupport>, IMultiObjectiveOptimizationSupport {
    32 
    33     protected override string CodeTemplate {
    34       get { return Templates.CompiledMultiObjectiveOptimizationSupport; }
    35     }
    36 
    3732    [StorableConstructor]
    3833    private MultiObjectiveOptimizationSupportScript(bool deserializing) : base(deserializing) { }
    3934    private MultiObjectiveOptimizationSupportScript(MultiObjectiveOptimizationSupportScript original, Cloner cloner) : base(original, cloner) { }
    40     public MultiObjectiveOptimizationSupportScript() : base() { }
     35    public MultiObjectiveOptimizationSupportScript() : base(Templates.CompiledMultiObjectiveOptimizationSupport) { }
    4136
    4237    public override IDeepCloneable Clone(Cloner cloner) {
  • TabularUnified stable/HeuristicLab.Problems.ExternalEvaluation/3.4/Programmable/OptimizationSupportScript.cs

    r13259 r13277  
    4646    protected OptimizationSupportScript()
    4747      : base() {
     48      variableStore = new VariableStore();
     49    }
     50
     51    protected OptimizationSupportScript(string code)
     52      : base(code) {
    4853      variableStore = new VariableStore();
    4954    }
  • TabularUnified stable/HeuristicLab.Problems.ExternalEvaluation/3.4/Programmable/SingleObjectiveOptimizationSupportScript.cs

    r13259 r13277  
    3131  [StorableClass]
    3232  public sealed class SingleObjectiveOptimizationSupportScript : OptimizationSupportScript<ISingleObjectiveOptimizationSupport>, ISingleObjectiveOptimizationSupport {
    33 
    34     protected override string CodeTemplate {
    35       get { return Templates.CompiledSingleObjectiveOptimizationSupport; }
    36     }
    37 
    3833    [StorableConstructor]
    3934    private SingleObjectiveOptimizationSupportScript(bool deserializing) : base(deserializing) { }
    4035    private SingleObjectiveOptimizationSupportScript(SingleObjectiveOptimizationSupportScript original, Cloner cloner) : base(original, cloner) { }
    41     public SingleObjectiveOptimizationSupportScript() : base() { }
     36    public SingleObjectiveOptimizationSupportScript() : base(Templates.CompiledSingleObjectiveOptimizationSupport) { }
    4237
    4338    public override IDeepCloneable Clone(Cloner cloner) {
Note: See TracChangeset for help on using the changeset viewer.