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

  • stable/HeuristicLab.Problems.Programmable/3.3/MultiObjectiveProblemDefinitionScript.cs

    r13259 r13277  
    3131    public string Filename { get; set; }
    3232
    33     protected override string CodeTemplate {
    34       get { return ScriptTemplates.CompiledMultiObjectiveProblemDefinition; }
    35     }
    36 
    3733    private new IMultiObjectiveProblemDefinition CompiledProblemDefinition {
    3834      get { return (IMultiObjectiveProblemDefinition)base.CompiledProblemDefinition; }
    … …  
    4137    [StorableConstructor]
    4238    private MultiObjectiveProblemDefinitionScript(bool deserializing) : base(deserializing) { }
    43     private MultiObjectiveProblemDefinitionScript(MultiObjectiveProblemDefinitionScript original, Cloner cloner)
    44       : base(original, cloner) { }
    45 
    46     public MultiObjectiveProblemDefinitionScript() {
    47       Code = CodeTemplate;
    48     }
     39    private MultiObjectiveProblemDefinitionScript(MultiObjectiveProblemDefinitionScript original, Cloner cloner) : base(original, cloner) { }
     40    public MultiObjectiveProblemDefinitionScript() : base(ScriptTemplates.CompiledMultiObjectiveProblemDefinition) { }
    4941
    5042    public override IDeepCloneable Clone(Cloner cloner) {

  • stable/HeuristicLab.Problems.Programmable/3.3/ProblemDefinitionScript.cs

    r12009 r13277  
    5353    protected ProblemDefinitionScript()
    5454      : base() {
     55      variableStore = new VariableStore();
     56    }
     57    protected ProblemDefinitionScript(string code)
     58      : base(code) {
    5559      variableStore = new VariableStore();
    5660    }

  • stable/HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProblemDefinitionScript.cs

    r12009 r13277  
    3232    public string Filename { get; set; }
    3333
    34     protected override string CodeTemplate {
    35       get { return ScriptTemplates.CompiledSingleObjectiveProblemDefinition; }
    36     }
    37 
    3834    private new ISingleObjectiveProblemDefinition CompiledProblemDefinition {
    3935      get { return (ISingleObjectiveProblemDefinition)base.CompiledProblemDefinition; }
    … …  
    4339    private SingleObjectiveProblemDefinitionScript(bool deserializing) : base(deserializing) { }
    4440    private SingleObjectiveProblemDefinitionScript(SingleObjectiveProblemDefinitionScript original, Cloner cloner) : base(original, cloner) { }
    45     public SingleObjectiveProblemDefinitionScript()
    46       : base() {
    47       Code = CodeTemplate;
    48     }
     41    public SingleObjectiveProblemDefinitionScript() : base(ScriptTemplates.CompiledSingleObjectiveProblemDefinition) { }
    4942
    5043    public override IDeepCloneable Clone(Cloner cloner) {
Note: See TracChangeset for help on using the changeset viewer.