Changeset 16937 for branches/2971_named_intervals

Timestamp:

05/09/19 13:47:14 (6 years 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:

• Implementation/Interval/IntervalConstraint.cs (modified) (8 diffs)
• ProblemDataConstraint.cs (modified) (4 diffs)

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval/IntervalConstraint.cs

@@ -28 +28 @@
   [Item("Interval Constraint", "Constraint on intervals.")]
   public sealed class IntervalConstraint : Item {
-    [Storable(Name = "Expression")]
+    [Storable]
     private string expression;
     public string Expression {
@@ -45 +45 @@
     }
 
-    [Storable(Name = "Variable")]
+    [Storable]
     private string variable;
     public string Variable {
@@ -58 +58 @@
     }
 
-    [Storable(Name = "Target")]
+    [Storable]
     private string target;
     public string Target {
@@ -75 +75 @@
     }
 
-    [Storable(Name = "NumberOfDerivation")]
+    [Storable]
     private int numberOfDerivation;
     public int NumberOfDerivation {
@@ -90 +90 @@
     }
 
-    [Storable(Name = "Interval")]
+    [Storable]
     private Interval interval;
     public Interval Interval {
@@ -103 +103 @@
     }
 
-    [Storable(Name = "InclusiveLowerBound")]
+    [Storable]
     private bool inclusiveLowerBound;
     public bool InclusiveLowerBound {
@@ -116 +116 @@
     }
 
-    [Storable(Name = "InclusiveUpperBound")]
+    [Storable]
     private bool inclusiveUpperBound;
     public bool InclusiveUpperBound {
@@ -129 +129 @@
     }
 
-    [Storable(Name = "Enabled")]
+    [Storable]
     private bool enabled;
     public bool Enabled {

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/ProblemDataConstraint.cs

@@ -38 +38 @@
                                                   "\u2202²'y'/\u2202'x'² in ]-1 .. inf.[";
 
-    [Storable(Name = "Input")]
+    [Storable]
     private string input;
     public string Input {
@@ -49 +49 @@
     }
 
-    [Storable(Name = "Constraints")]
+    [Storable]
     private IEnumerable<IntervalConstraint> constraints;
     public IEnumerable<IntervalConstraint> Constraints {
-      get => constraints.ToList();
+      get => constraints;
       set {
         if (constraints == value) return;
@@ -78 +78 @@
     public ProblemDataConstraint() :base () {
       this.Input = exampleInput;
-      this.constraints = new CheckedItemList<IntervalConstraint>();
+      this.constraints = new List<IntervalConstraint>();
       this.ProblemData = null;
     }
@@ -84 +84 @@
     public ProblemDataConstraint(IRegressionProblemData problemData) : base() {
       this.Input = exampleInput;
-      this.constraints = new CheckedItemList<IntervalConstraint>();
+      this.constraints = new List<IntervalConstraint>();
       this.ProblemData = problemData;
     }