Changeset 16937


Ignore:
Timestamp:
05/09/19 13:47:14 (3 months ago)
Author:
chaider
Message:

#2971 Removed Name from Storable attribute and initialized constraints with empty List

Location:
branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval/IntervalConstraint.cs

    r16935 r16937  
    2828  [Item("Interval Constraint", "Constraint on intervals.")]
    2929  public sealed class IntervalConstraint : Item {
    30     [Storable(Name = "Expression")]
     30    [Storable]
    3131    private string expression;
    3232    public string Expression {
     
    4545    }
    4646
    47     [Storable(Name = "Variable")]
     47    [Storable]
    4848    private string variable;
    4949    public string Variable {
     
    5858    }
    5959
    60     [Storable(Name = "Target")]
     60    [Storable]
    6161    private string target;
    6262    public string Target {
     
    7575    }
    7676
    77     [Storable(Name = "NumberOfDerivation")]
     77    [Storable]
    7878    private int numberOfDerivation;
    7979    public int NumberOfDerivation {
     
    9090    }
    9191
    92     [Storable(Name = "Interval")]
     92    [Storable]
    9393    private Interval interval;
    9494    public Interval Interval {
     
    103103    }
    104104
    105     [Storable(Name = "InclusiveLowerBound")]
     105    [Storable]
    106106    private bool inclusiveLowerBound;
    107107    public bool InclusiveLowerBound {
     
    116116    }
    117117
    118     [Storable(Name = "InclusiveUpperBound")]
     118    [Storable]
    119119    private bool inclusiveUpperBound;
    120120    public bool InclusiveUpperBound {
     
    129129    }
    130130
    131     [Storable(Name = "Enabled")]
     131    [Storable]
    132132    private bool enabled;
    133133    public bool Enabled {
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/ProblemDataConstraint.cs

    r16935 r16937  
    3838                                                  "\u2202²'y'/\u2202'x'² in ]-1 .. inf.[";
    3939
    40     [Storable(Name = "Input")]
     40    [Storable]
    4141    private string input;
    4242    public string Input {
     
    4949    }
    5050
    51     [Storable(Name = "Constraints")]
     51    [Storable]
    5252    private IEnumerable<IntervalConstraint> constraints;
    5353    public IEnumerable<IntervalConstraint> Constraints {
    54       get => constraints.ToList();
     54      get => constraints;
    5555      set {
    5656        if (constraints == value) return;
     
    7878    public ProblemDataConstraint() :base () {
    7979      this.Input = exampleInput;
    80       this.constraints = new CheckedItemList<IntervalConstraint>();
     80      this.constraints = new List<IntervalConstraint>();
    8181      this.ProblemData = null;
    8282    }
     
    8484    public ProblemDataConstraint(IRegressionProblemData problemData) : base() {
    8585      this.Input = exampleInput;
    86       this.constraints = new CheckedItemList<IntervalConstraint>();
     86      this.constraints = new List<IntervalConstraint>();
    8787      this.ProblemData = problemData;
    8888    }
Note: See TracChangeset for help on using the changeset viewer.