Changeset 17887 for branches/3073_IA_constraint_splitting_reintegration/HeuristicLab.Problems.DataAnalysis.Views

Timestamp:

03/12/21 14:00:36 (3 years ago)

Author:

gkronber

Message:

#3073: intermediate comment while refactoring the branch

Location:

branches/3073_IA_constraint_splitting_reintegration/HeuristicLab.Problems.DataAnalysis.Views/3.4

Files:

• IntervalConstraintView.cs (modified) (1 diff)
• ProblemDataConstraintView.Designer.cs (modified) (2 diffs)
• ProblemDataConstraintView.cs (modified) (4 diffs)

branches/3073_IA_constraint_splitting_reintegration/HeuristicLab.Problems.DataAnalysis.Views/3.4/IntervalConstraintView.cs

@@ -30 +30 @@
 namespace HeuristicLab.Problems.DataAnalysis.Views {
   [View("Interval Constraint Detail View")]
-  [Content(typeof(IntervalConstraint), true)]
+  [Content(typeof(ShapeConstraint), true)]
   public sealed partial class IntervalConstraintView : ItemView {
-    public new IntervalConstraint Content {
-      get => (IntervalConstraint) base.Content;
+    public new ShapeConstraint Content {
+      get => (ShapeConstraint) base.Content;
       set => base.Content = value;
     }

branches/3073_IA_constraint_splitting_reintegration/HeuristicLab.Problems.DataAnalysis.Views/3.4/ProblemDataConstraintView.Designer.cs

@@ -58 +58 @@
       this.errorOutput = new System.Windows.Forms.Label();
       this.label1 = new System.Windows.Forms.Label();
-      this.intervalConstraintsView = new CheckedItemListView<IntervalConstraint>();
+      this.intervalConstraintsView = new CheckedItemListView<ShapeConstraint>();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
       this.splitContainer1.Panel1.SuspendLayout();
@@ -183 +183 @@
     private System.Windows.Forms.Button                                     parseBtn;
     private System.Windows.Forms.Label                                      label1;
-    private HeuristicLab.Core.Views.CheckedItemListView<IntervalConstraint> intervalConstraintsView;
+    private HeuristicLab.Core.Views.CheckedItemListView<ShapeConstraint> intervalConstraintsView;
     private System.Windows.Forms.TextBox                                    constraintsInput;
     private Label                                                           errorOutput;

branches/3073_IA_constraint_splitting_reintegration/HeuristicLab.Problems.DataAnalysis.Views/3.4/ProblemDataConstraintView.cs

@@ -32 +32 @@
 namespace HeuristicLab.Problems.DataAnalysis.Views {
   [View("ParsedConstraint View")]
-  [Content(typeof(ProblemDataConstraint), true)]
+  [Content(typeof(ShapeConstraints), true)]
   public partial class ProblemDataConstraintView : AsynchronousContentView {
-    private readonly CheckedItemList<IntervalConstraint>
-      intervalConstraints = new CheckedItemList<IntervalConstraint>();
+    private readonly CheckedItemList<ShapeConstraint>
+      intervalConstraints = new CheckedItemList<ShapeConstraint>();
 
-    public new ProblemDataConstraint Content {
-      get => (ProblemDataConstraint) base.Content;
+    public new ShapeConstraints Content {
+      get => (ShapeConstraints) base.Content;
       set => base.Content = value;
     }
@@ -73 +73 @@
 
 
-    private IEnumerable<IntervalConstraint> ParseConstraints(string input) {
-      return IntervalConstraintsParser.ParseInput(input, Content.ProblemData.TargetVariable,
+    private IEnumerable<ShapeConstraint> ParseConstraints(string input) {
+      return ShapeConstraintsParser.ParseInput(input, Content.ProblemData.TargetVariable,
                                                   Content.ProblemData.AllowedInputVariables);
     }
@@ -90 +90 @@
         }
         catch (ArgumentException ex) {
-          Content.Constraints = new List<IntervalConstraint>();
+          Content.Constraints = new List<ShapeConstraint>();
           Content.InfoText    = ex.Message.Replace("Parameter name", "@Line");
           Content.InfoColor   = Color.DarkRed;
@@ -117 +117 @@
 
     private void constraint_Changed(object sender, EventArgs e) {
-      var constraint = (IntervalConstraint) sender;
+      var constraint = (ShapeConstraint) sender;
       intervalConstraints.SetItemCheckedState(constraint, constraint.Enabled);
     }
 
     private void constraints_Updated(object                                                           sender,
-                                     CollectionItemsChangedEventArgs<IndexedItem<IntervalConstraint>> e) {
+                                     CollectionItemsChangedEventArgs<IndexedItem<ShapeConstraint>> e) {
       foreach (var addedItem in e.Items) addedItem.Value.Changed += constraint_Changed;
     }
 
-    private void constraint_removed(object sender, CollectionItemsChangedEventArgs<IndexedItem<IntervalConstraint>> e) {
+    private void constraint_removed(object sender, CollectionItemsChangedEventArgs<IndexedItem<ShapeConstraint>> e) {
       foreach (var removedItem in e.Items) removedItem.Value.Changed -= constraint_Changed;
     }
 
     private void constraint_CheckedItemChanged(object                                                           sender,
-                                               CollectionItemsChangedEventArgs<IndexedItem<IntervalConstraint>> e) {
-      ICheckedItemList<IntervalConstraint> checkedItemList           = (ICheckedItemList<IntervalConstraint>) sender;
+                                               CollectionItemsChangedEventArgs<IndexedItem<ShapeConstraint>> e) {
+      ICheckedItemList<ShapeConstraint> checkedItemList           = (ICheckedItemList<ShapeConstraint>) sender;
       foreach (var indexedItem in e.Items) indexedItem.Value.Enabled = checkedItemList.ItemChecked(indexedItem.Value);
     }