Changeset 16772 for branches

Timestamp:

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

Author:

chaider

Message:

#2971 Changed IntervalConstraints View

Location:

branches/2971_named_intervals

Files:

• HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/IntervalConstraintView.Designer.cs (added)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/IntervalConstraintView.cs (added)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/IntervalConstraintView.resx (added)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/ParsedConstraintView.cs (modified) (4 diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/ParsedConstraintView.designer.cs (modified) (4 diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/ParsedConstraintView.resx (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Parser/IntervalConstraint.cs (modified) (3 diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/ParsedConstraint.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/Properties/Annotations.cs (added)

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

@@ -576 +576 @@
       <DependentUpon>TimeSeriesPrognosisSolutionErrorCharacteristicsCurveView.cs</DependentUpon>
     </Compile>
+    <Compile Include="IntervalConstraintView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="IntervalConstraintView.Designer.cs">
+      <DependentUpon>IntervalConstraintView.cs</DependentUpon>
+    </Compile>
     <None Include="HeuristicLab.snk" />
     <None Include="Plugin.cs.frame" />
@@ -628 +634 @@
       <DependentUpon>TextValueView.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="IntervalConstraintView.resx">
+      <DependentUpon>IntervalConstraintView.cs</DependentUpon>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

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

@@ -8 +8 @@
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using HeuristicLab.Core;
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
@@ -22 +23 @@
     public ParsedConstraintView() {
       InitializeComponent();
-      constraintsOutput.ReadOnly = true;
+      errorOutput.Text = "";
     }
 
@@ -29 +30 @@
       if (Content == null) {
         constraintsInput.Text = string.Empty;
-        constraintsOutput.Text = string.Empty;
-      } else { 
+        errorOutput.Text = "";
+      } else {
         constraintsInput.Text = Content.Input;
-        constraintsOutput.Text = ConstraintsOutput(Content.Constraints ?? new List<IntervalConstraint>());
+        constraintsOutput.Content = new ItemList<IntervalConstraint>(Content.Constraints) ?? new ItemList<IntervalConstraint>();
       }
     }
 
-    private IEnumerable<IntervalConstraint> ParseConstraints(string input) {
-      var parsedIntervals = IntervalConstraintsParser.Parse(input);
-      return parsedIntervals;
+    private ItemList<IntervalConstraint> ParseConstraints(string input) {
+      ItemList<IntervalConstraint> constraints = new ItemList<IntervalConstraint>(IntervalConstraintsParser.Parse(input));
+      return constraints;
     }
 
@@ -55 +56 @@
     private void parseBtn_Click(object sender, EventArgs e) {
       if (constraintsInput.Text != null) {
-        var constraints = ParseConstraints(constraintsInput.Text);
-        constraintsOutput.Text = ConstraintsOutput(constraints);
-        Content.Constraints = constraints;
+        var constaints = ParseConstraints(constraintsInput.Text);
+        constraintsOutput.Content = constaints;
+        Content.Constraints = constaints;
         Content.Input = constraintsInput.Text;
-      } else { 
-        constraintsOutput.Text = "No Constraints found!";
+        errorOutput.Text = "";
+      } else {
+        errorOutput.Text = "No constraints were found!";
       }
+    }
+
+    private void constraintsInput_TextChanged(object sender, EventArgs e) {
+      errorOutput.Text = "Unparsed changes! Press parse button to save changes.";
     }
   }

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

@@ -24 +24 @@
     /// </summary>
     private void InitializeComponent() {
+      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ParsedConstraintView));
       this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+      this.groupBox1 = new System.Windows.Forms.GroupBox();
+      this.constraintsInput = new System.Windows.Forms.TextBox();
       this.parseBtn = new System.Windows.Forms.Button();
-      this.constraintsOutput = new System.Windows.Forms.TextBox();
-      this.constraintsInput = new System.Windows.Forms.TextBox();
+      this.label1 = new System.Windows.Forms.Label();
+      this.groupBox2 = new System.Windows.Forms.GroupBox();
+      //this.constraintsOutput = new System.Windows.Forms.Label();
+      this.constraintsOutput = new HeuristicLab.Core.Views.ItemListView<IntervalConstraint>();
+      this.errorOutput = new System.Windows.Forms.Label();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
       this.splitContainer1.Panel1.SuspendLayout();
       this.splitContainer1.Panel2.SuspendLayout();
       this.splitContainer1.SuspendLayout();
+      this.groupBox1.SuspendLayout();
+      this.groupBox2.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -39 +47 @@
       this.splitContainer1.Location = new System.Drawing.Point(0, 0);
       this.splitContainer1.Name = "splitContainer1";
-      this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
       // 
       // splitContainer1.Panel1
       // 
-      this.splitContainer1.Panel1.Controls.Add(this.constraintsInput);
-      this.splitContainer1.Panel1.Controls.Add(this.constraintsOutput);
+      this.splitContainer1.Panel1.Controls.Add(this.groupBox1);
       // 
       // splitContainer1.Panel2
       // 
-      this.splitContainer1.Panel2.Controls.Add(this.parseBtn);
-      this.splitContainer1.Size = new System.Drawing.Size(517, 386);
-      this.splitContainer1.SplitterDistance = 347;
+      this.splitContainer1.Panel2.Controls.Add(this.groupBox2);
+      this.splitContainer1.Size = new System.Drawing.Size(888, 629);
+      this.splitContainer1.SplitterDistance = 296;
       this.splitContainer1.TabIndex = 0;
+      // 
+      // groupBox1
+      // 
+      this.groupBox1.Controls.Add(this.constraintsInput);
+      this.groupBox1.Controls.Add(this.parseBtn);
+      this.groupBox1.Controls.Add(this.label1);
+      this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.groupBox1.Location = new System.Drawing.Point(0, 0);
+      this.groupBox1.Name = "groupBox1";
+      this.groupBox1.Size = new System.Drawing.Size(296, 629);
+      this.groupBox1.TabIndex = 3;
+      this.groupBox1.TabStop = false;
+      this.groupBox1.Text = "Constraints Input";
+      // 
+      // constraintsInput
+      // 
+      this.constraintsInput.AcceptsTab = true;
+      this.constraintsInput.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.constraintsInput.Location = new System.Drawing.Point(3, 198);
+      this.constraintsInput.Multiline = true;
+      this.constraintsInput.Name = "constraintsInput";
+      this.constraintsInput.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+      this.constraintsInput.Size = new System.Drawing.Size(290, 405);
+      this.constraintsInput.TabIndex = 2;
+      this.constraintsInput.TextChanged += new System.EventHandler(this.constraintsInput_TextChanged);
       // 
       // parseBtn
       // 
-      this.parseBtn.Location = new System.Drawing.Point(3, 3);
+      this.parseBtn.Dock = System.Windows.Forms.DockStyle.Bottom;
+      this.parseBtn.Location = new System.Drawing.Point(3, 603);
       this.parseBtn.Name = "parseBtn";
-      this.parseBtn.Size = new System.Drawing.Size(75, 23);
-      this.parseBtn.TabIndex = 0;
-      this.parseBtn.Text = "Parse";
+      this.parseBtn.Size = new System.Drawing.Size(290, 23);
+      this.parseBtn.TabIndex = 1;
+      this.parseBtn.Text = "Parse Constraints";
       this.parseBtn.UseVisualStyleBackColor = true;
       this.parseBtn.Click += new System.EventHandler(this.parseBtn_Click);
       // 
+      // label1
+      // 
+      this.label1.AutoSize = true;
+      this.label1.Dock = System.Windows.Forms.DockStyle.Top;
+      this.label1.Location = new System.Drawing.Point(3, 16);
+      this.label1.Name = "label1";
+      this.label1.Size = new System.Drawing.Size(250, 182);
+      this.label1.TabIndex = 0;
+      this.label1.Text = resources.GetString("label1.Text");
+      // 
+      // groupBox2
+      // 
+      this.groupBox2.Controls.Add(this.constraintsOutput);
+      this.groupBox2.Controls.Add(this.errorOutput);
+      this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.groupBox2.Location = new System.Drawing.Point(0, 0);
+      this.groupBox2.Name = "groupBox2";
+      this.groupBox2.Size = new System.Drawing.Size(588, 629);
+      this.groupBox2.TabIndex = 0;
+      this.groupBox2.TabStop = false;
+      this.groupBox2.Text = "Parsed Constraints";
+      // 
       // constraintsOutput
       // 
-      this.constraintsOutput.Dock = System.Windows.Forms.DockStyle.Right;
-      this.constraintsOutput.Location = new System.Drawing.Point(276, 0);
-      this.constraintsOutput.Multiline = true;
+      this.constraintsOutput.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.constraintsOutput.Location = new System.Drawing.Point(3, 16);
       this.constraintsOutput.Name = "constraintsOutput";
-      this.constraintsOutput.Size = new System.Drawing.Size(241, 347);
-      this.constraintsOutput.TabIndex = 0;
+      this.constraintsOutput.Size = new System.Drawing.Size(582, 587);
+      this.constraintsOutput.TabIndex = 2;
       // 
-      // constraintsInput
+      // errorOutput
       // 
-      this.constraintsInput.Dock = System.Windows.Forms.DockStyle.Left;
-      this.constraintsInput.Location = new System.Drawing.Point(0, 0);
-      this.constraintsInput.Multiline = true;
-      this.constraintsInput.Name = "constraintsInput";
-      this.constraintsInput.Size = new System.Drawing.Size(241, 347);
-      this.constraintsInput.TabIndex = 1;
+      this.errorOutput.Dock = System.Windows.Forms.DockStyle.Bottom;
+      this.errorOutput.ForeColor = System.Drawing.Color.Red;
+      this.errorOutput.Location = new System.Drawing.Point(3, 603);
+      this.errorOutput.Name = "errorOutput";
+      this.errorOutput.Size = new System.Drawing.Size(582, 23);
+      this.errorOutput.TabIndex = 1;
+      this.errorOutput.Text = "ERROR";
+      this.errorOutput.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
       // 
       // ParsedConstraintView
@@ -87 +142 @@
       this.Controls.Add(this.splitContainer1);
       this.Name = "ParsedConstraintView";
-      this.Size = new System.Drawing.Size(517, 386);
+      this.Size = new System.Drawing.Size(888, 629);
       this.splitContainer1.Panel1.ResumeLayout(false);
-      this.splitContainer1.Panel1.PerformLayout();
       this.splitContainer1.Panel2.ResumeLayout(false);
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
       this.splitContainer1.ResumeLayout(false);
+      this.groupBox1.ResumeLayout(false);
+      this.groupBox1.PerformLayout();
+      this.groupBox2.ResumeLayout(false);
       this.ResumeLayout(false);
 
@@ -100 +157 @@
 
     private System.Windows.Forms.SplitContainer splitContainer1;
+    private System.Windows.Forms.GroupBox groupBox1;
     private System.Windows.Forms.Button parseBtn;
+    private System.Windows.Forms.Label label1;
     private System.Windows.Forms.TextBox constraintsInput;
-    private System.Windows.Forms.TextBox constraintsOutput;
+    private System.Windows.Forms.GroupBox groupBox2;
+    private System.Windows.Forms.Label errorOutput;
+
+    //private System.Windows.Forms.Label constraintsOutput;
+    private HeuristicLab.Core.Views.ItemListView<IntervalConstraint> constraintsOutput;
   }
 }

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

@@ -118 +118 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="label1.Text" xml:space="preserve">
+    <value>Input your Constraints here. 
+The constraints must be in a form like this:
+Target:F1 in [0 .. 100]
+dF1 / X1 in ].inf .. 100]
+
+- Mark Target Variable with Prefix Target:
+- Derivation can be written with d or symbol
+- the in keywords seperates formulation from interval
+- Interval can be closed [ or open ]
+- Lowerbound and Upperbound are seperated by ..
+- Postive infinity (inf.) 
+- Negative infinity (-inf.)
+
+Comments can be written with leading #
+</value>
+  </data>
 </root>

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>();
     }