Changeset 16772 for branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis

Timestamp:

04/08/19 15:29:49 (6 years ago)

Author:

chaider

Message:

#2971 Changed IntervalConstraints View

Location:

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

Files:

• HeuristicLab.Problems.DataAnalysis-3.4.csproj (modified) (1 diff)
• Implementation/Parser/IntervalConstraint.cs (modified) (3 diffs)
• ParsedConstraint.cs (modified) (2 diffs)
• Properties/Annotations.cs (added)

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj

@@ -306 +306 @@
     <Compile Include="Implementation\Classification\ThresholdCalculators\NormalDistributionCutPointsThresholdCalculator.cs" />
     <Compile Include="Implementation\Classification\ThresholdCalculators\ThresholdCalculator.cs" />
+    <Compile Include="Properties\Annotations.cs" />
     <Compile Include="TextValue.cs" />
     <None Include="HeuristicLab.snk" />

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

@@ -1 @@
-using HEAL.Attic;
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Runtime.CompilerServices;
+using HeuristicLab.Common;
+using HeuristicLab.Core;
+using HeuristicLab.Problems.DataAnalysis.Annotations;
+using HEAL.Attic;
 
 namespace HeuristicLab.Problems.DataAnalysis {
   [StorableType("8109BE58-CCFB-4462-A2F4-EEE5DFADAFF7")]
-  public class IntervalConstraint {
+  [Item("Interval Constraint", "Constraint on intervals.")]
+  public class IntervalConstraint : Item {
     public string Expression { get; set; }
     public string Definition { get; set; }
@@ -13 +21 @@
     public int NumberOfDerivation { get; set; }
 
-    public IntervalConstraint() { }
+    public IntervalConstraint() {}
 
-    public IntervalConstraint(string expression, string definition, Interval interval, bool inclusiveLowerBound, bool inclusiveUpperBound, bool isDerivation, string variable, int numberOfDerivation) {
+    public IntervalConstraint(string expression, string definition, Interval interval, bool inclusiveLowerBound,
+      bool inclusiveUpperBound, bool isDerivation, string variable, int numberOfDerivation) {
       Expression = expression;
       Definition = definition;
@@ -25 +34 @@
       NumberOfDerivation = numberOfDerivation;
     }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new IntervalConstraint(this, cloner);
+    }
+
+    protected IntervalConstraint(IntervalConstraint original, Cloner cloner)
+      : base(original, cloner) {
+      this.Expression = original.Expression;
+      this.Definition = original.Definition;
+      this.Interval = original.Interval;
+      this.InclusiveLowerBound = original.InclusiveLowerBound;
+      this.InclusiveUpperBound = original.InclusiveUpperBound;
+      this.IsDerivation = original.IsDerivation;
+      this.Variable = original.Variable;
+      this.NumberOfDerivation = NumberOfDerivation;
+    }
+
+    public event EventHandler Changed;
+    protected virtual void OnChanged(EventArgs e) {
+      EventHandler handlers = Changed;
+      if (handlers != null)
+        handlers(this, e);
+    }
   }
 }

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

@@ -29 +29 @@
       : base(original, cloner) {
       this.input = original.Input ?? string.Empty;
-      this.constraints = original.Constraints ?? new List<IntervalConstraint>();
+      this.constraints = original.Constraints ?? new ItemList<IntervalConstraint>();
     }
 
@@ -38 +38 @@
     public ParsedConstraint() {
       this.input = string.Empty;
-      this.constraints = new List<IntervalConstraint>();
+      this.constraints = new ItemList<IntervalConstraint>();
     }
 
     public ParsedConstraint(string input) {
       this.input = input;
-      this.constraints = new List<IntervalConstraint>();
+      this.constraints = new ItemList<IntervalConstraint>();
     }