Changeset 16841

Timestamp:

04/19/19 10:57:30 (6 years ago)

Author:

chaider

Message:

#2971 added getter and setter for variable ranges and interval constraints

Location:

branches/2971_named_intervals

Files:

• HeuristicLab.Problems.DataAnalysis.Views/3.4/ParsedConstraintView.designer.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionProblemData.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/ParsedConstraint.cs (modified) (1 diff)

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/ParsedConstraintView.designer.cs

@@ -1 @@
-namespace HeuristicLab.Problems.DataAnalysis.Views {
+using System;
+
+namespace HeuristicLab.Problems.DataAnalysis.Views {
   partial class ParsedConstraintView {
     /// <summary> 
@@ -101 +103 @@
       this.label1.Size = new System.Drawing.Size(250, 182);
       this.label1.TabIndex = 0;
-      this.label1.Text = resources.GetString("label1.Text");
+      this.label1.Text = "To define Target Variable constraints:" + Environment.NewLine + 
+                         "1. Start the definition with Target:" + Environment.NewLine + 
+                         "2. Specify the target variable" + Environment.NewLine + 
+                         "3. Add the key word in" + Environment.NewLine + 
+                         "4. Specify the Interval with [lowerbound .. upperbound]" + Environment.NewLine +
+                         "5. Square bracket open or closed specify open or closed interval" + Environment.NewLine + Environment.NewLine + 
+                         "To define a derivation constraint: " + Environment.NewLine + 
+                         "1. Start with d or \u2202" + Environment.NewLine + 
+                         "2. Specify the target" + Environment.NewLine + 
+                         "3. add space and / and space" + Environment.NewLine + 
+                         "4. add derivation variable then follow step 4-5 from mabove"; 
       // 
       // constraintsOutput

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs

@@ -105 +105 @@
     public IFixedValueParameter<NamedIntervals> VariableRangesParameter => (IFixedValueParameter<NamedIntervals>)Parameters[VariableRangesParameterName];
 
-    public NamedIntervals VariableRanges => VariableRangesParameter.Value;
+    public NamedIntervals VariableRanges {
+      get => VariableRangesParameter.Value;
+      set => VariableRanges = value ?? throw new ArgumentNullException("Variable Ranges", "The given variable ranges are null");
+    }
+
 
     public IFixedValueParameter<ParsedConstraint> IntervalConstraintsParameter => (IFixedValueParameter<ParsedConstraint>)Parameters[IntervalConstraintsParameterName];
-    public ParsedConstraint IntervalConstraints => IntervalConstraintsParameter.Value;
+
+    public ParsedConstraint IntervalConstraints {
+      get => IntervalConstraintsParameter.Value;
+      set => IntervalConstraints = value ?? throw new ArgumentNullException("IntervalCosntraint", "The given Constraint is null.");
+    }
+
 
     public string TargetVariable {

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionProblemData.cs

@@ -28 +28 @@
     string TargetVariable { get; set; }
 
-    NamedIntervals VariableRanges { get; }
-    ParsedConstraint IntervalConstraints { get; }
+    NamedIntervals VariableRanges { get; set; }
+    ParsedConstraint IntervalConstraints { get; set; }
     IEnumerable<double> TargetVariableValues { get; }
     IEnumerable<double> TargetVariableTrainingValues { get; }

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

@@ -34 +34 @@
                                                   "Target:y in [0 .. 100]" + Environment.NewLine + Environment.NewLine +
                                                   "#Example for constraint on model parameter: " + Environment.NewLine +
-                                                  "dy/dx in [0 .. 10]" + Environment.NewLine +
-                                                  "\u2202²y/\u2202x² in ]-1 .. inf.[";
+                                                  "dy / dx in [0 .. 10]" + Environment.NewLine +
+                                                  "\u2202²y / \u2202x² in ]-1 .. inf.[";
       
     public string Input { get; set; }