Changeset 16800 for branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4

Timestamp:

04/17/19 14:37:55 (5 years ago)

Author:

chaider

Message:

#2971 Several chanages regarding review comments

Location:

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

Files:

• HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj (modified) (2 diffs)
• IntervalConstraintView.cs (modified) (9 diffs)
• ParsedConstraintView.cs (modified) (5 diffs)
• TextValueView.cs (deleted)
• TextValueView.designer.cs (deleted)
• TextValueView.resx (deleted)

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

@@ -550 +550 @@
       <DependentUpon>TimeSeriesPrognosisSolutionView.cs</DependentUpon>
     </Compile>
-    <Compile Include="TextValueView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="TextValueView.designer.cs">
-      <DependentUpon>TextValueView.cs</DependentUpon>
-    </Compile>
     <Compile Include="TimeSeriesPrognosis\TimeSeriesPrognosisResidualsLineChartView.cs">
       <SubType>UserControl</SubType>
@@ -630 +624 @@
       <DependentUpon>NamedIntervalsView.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="TextValueView.resx">
-      <DependentUpon>TextValueView.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="IntervalConstraintView.resx">
       <DependentUpon>IntervalConstraintView.cs</DependentUpon>

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/IntervalConstraintView.cs

@@ -29 +29 @@
       definitionInput.ReadOnly = true;
       derivationInput.Enabled = false;
-      derivationInput.Checked = Content?.IsDerivation ?? false;
+      derivationInput.Checked = false;
       numberderivationInput.DataSource = items;
     }
@@ -101 +101 @@
         }
 
-        ischeckedCheckBox.Checked = Content.IsChecked;
+        ischeckedCheckBox.Checked = Content.Enabled;
       }
       SetEnabledStateOfControls();
     }
 
-    private void UpdateExpression() {
+    private static string UpdateExpression(IntervalConstraint constraint) {
       var expression = "";
 
-      if (!Content.IsDerivation) {
-        expression = string.Format("{0} in {1}{2} .. {3}{4}", 
-          Content.Variable, 
-          (Content.InclusiveLowerBound) ? "[" : "]", 
-          Content.Interval.LowerBound,
-          Content.Interval.UpperBound,
-          (Content.InclusiveUpperBound) ? "]" : "[");
+      if (!constraint.IsDerivation) {
+        expression = string.Format("{0} in {1}{2} .. {3}{4}",
+          constraint.Variable, 
+          (constraint.InclusiveLowerBound) ? "[" : "]",
+          constraint.Interval.LowerBound,
+          constraint.Interval.UpperBound,
+          (constraint.InclusiveUpperBound) ? "]" : "[");
       } else {
         expression = string.Format("\u2202{5}Target/\u2202{0}{6} in {1}{2} .. {3}{4}",
-          Content.Variable,
-          (Content.InclusiveLowerBound) ? "[" : "]",
-          Content.Interval.LowerBound,
-          Content.Interval.UpperBound,
-          (Content.InclusiveUpperBound) ? "]" : "[",
-          PrintNumberOfDerivation(Content.numberOfDerivation),
-          PrintNumberOfDerivation(Content.numberOfDerivation));
-      }
-
-      Content.Expression = expression;
-      Content.Name = expression;
-      UpdateControls();
-    }
-
-    private string PrintNumberOfDerivation(int derivation) {
+          constraint.Variable,
+          (constraint.InclusiveLowerBound) ? "[" : "]",
+          constraint.Interval.LowerBound,
+          constraint.Interval.UpperBound,
+          (constraint.InclusiveUpperBound) ? "]" : "[",
+          PrintNumberOfDerivation(constraint.numberOfDerivation),
+          PrintNumberOfDerivation(constraint.numberOfDerivation));
+      }
+
+      return expression;
+    }
+
+    private static string PrintNumberOfDerivation(int derivation) {
       switch (derivation) {
         case 1:
@@ -150 +148 @@
     private void lowerboundInput_Validating(object sender, CancelEventArgs e) {
       var value = ParseDoubleValue(lowerboundInput.Text, lowerboundInput);
-      if (!double.IsNaN(value)) {
-        if (value <= Content.Interval.UpperBound) {
-          errorProvider.SetError(lowerboundInput, string.Empty);
-          e.Cancel = false;
-        } else {
-          errorProvider.SetError(lowerboundInput, "Invalid Input: Lowerbound must be smaller than Upperbound!");
-          e.Cancel = true;
-        }
-      } else {
-        e.Cancel = true;
-      }
+      if (double.IsNaN(value)) {
+        errorProvider.SetError(lowerboundInput, "Invalid Input: Lowerbound must be a double value!");
+        e.Cancel = true;
+        return;
+      }
+
+      if (value > Content.Interval.UpperBound) {
+        errorProvider.SetError(lowerboundInput, "Invalid Input: Lowerbound must be smaller than Upperbound!");
+        e.Cancel = true;
+        return;
+      }
+
+      errorProvider.SetError(lowerboundInput, string.Empty);
+      e.Cancel = false;
     }
 
@@ -167 +168 @@
       if (!double.IsNaN(value)) {
         Content.Interval = new Interval(value, Content.Interval.UpperBound);
-        UpdateExpression();
+        var exp = UpdateExpression(Content);
+        Content.Name = exp;
+        Content.Expression = exp;
       }
     }
@@ -173 +176 @@
     private void upperboundInput_Validating(object sender, CancelEventArgs e) {
       var value = ParseDoubleValue(upperboundInput.Text, upperboundInput);
-      if (!double.IsNaN(value)) {
-        if (value >= Content.Interval.LowerBound) {
-          errorProvider.SetError(upperboundInput, string.Empty);
-          e.Cancel = false;
-        } else {
-          errorProvider.SetError(lowerboundInput, "Invalid Input: Upperbound must be bigger than Lowerbound!");
-          e.Cancel = true;
-        }
-      } else {
-        e.Cancel = true;
-      }
+      if (double.IsNaN(value)) {
+        errorProvider.SetError(upperboundInput, "Invalid Input: Upperbound must be a double value!");
+        e.Cancel = true;
+        return;
+      }
+
+      if (value < Content.Interval.LowerBound) {
+        errorProvider.SetError(upperboundInput, "Invalid Input: Upperbound must be bigger than Lowerbound!");
+        e.Cancel = true;
+        return;
+      }
+
+      errorProvider.SetError(upperboundInput, string.Empty);
+      e.Cancel = false;
     }
 
@@ -190 +196 @@
       if (!double.IsNaN(value)) {
         Content.Interval = new Interval(Content.Interval.LowerBound, value);
-        UpdateExpression();
+        var exp = UpdateExpression(Content);
+        Content.Name = exp;
+        Content.Expression = exp;
       }
     }
@@ -197 +205 @@
       if (Content.InclusiveLowerBound != incllowerboundInput.Checked) {
         Content.InclusiveLowerBound = incllowerboundInput.Checked;
-        UpdateExpression();
+        var exp = UpdateExpression(Content);
+        Content.Name = exp;
+        Content.Expression = exp;
       }
       
@@ -206 +216 @@
       if (Content.InclusiveUpperBound != inclupperboundInput.Checked) { 
         Content.InclusiveUpperBound = inclupperboundInput.Checked;
-        UpdateExpression();
+        var exp = UpdateExpression(Content);
+        Content.Name = exp;
+        Content.Expression = exp;
       }
     }
 
     private void ischeckedCheckBox_CheckedChanged(object sender, EventArgs e) {
-      if (Content.IsChecked != ischeckedCheckBox.Checked) {
-        Content.IsChecked = ischeckedCheckBox.Checked;
-        UpdateControls();
+      if (Content.Enabled != ischeckedCheckBox.Checked) {
+        Content.Enabled = ischeckedCheckBox.Checked;
+        //UpdateControls();
       }
     }
@@ -225 +237 @@
         Content.numberOfDerivation = 3;
 
-      UpdateExpression();
+      var exp = UpdateExpression(Content);
+      Content.Name = exp;
+      Content.Expression = exp;
     }
 

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

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+using System;
 using System.Collections.Generic;
 using HeuristicLab.Collections;
@@ -39 +59 @@
         foreach (var constraint in parsedConstraints) {
           constraint.Changed += constraint_Changed;
-          intervalConstraints.Add(constraint, constraint.IsChecked);
+          intervalConstraints.Add(constraint, constraint.Enabled);
         }
         constraintsOutput.Content = intervalConstraints;
@@ -59 +79 @@
         foreach (var constraint in Content.Constraints) {
           constraint.Changed += constraint_Changed;
-          intervalConstraints.Add(constraint, constraint.IsChecked);
+          intervalConstraints.Add(constraint, constraint.Enabled);
         }
 
@@ -69 +89 @@
     private void constraint_Changed(object sender, EventArgs e) {
       var constraint = (IntervalConstraint) sender;
-      intervalConstraints.SetItemCheckedState(constraint, constraint.IsChecked);
+      intervalConstraints.SetItemCheckedState(constraint, constraint.Enabled);
     }
 
@@ -76 +96 @@
       ICheckedItemList<IntervalConstraint> checkedItemList = (ICheckedItemList<IntervalConstraint>) sender;
       foreach (var indexedItem in e.Items) {
-        indexedItem.Value.IsChecked = checkedItemList.ItemChecked(indexedItem.Value);
+        indexedItem.Value.Enabled = checkedItemList.ItemChecked(indexedItem.Value);
       }
     }