Changeset 3614 for trunk/sources

Timestamp:

05/05/10 00:10:13 (15 years ago)

Author:

mkommend

Message:

implemented first version of RunConstraints (ticket #970)

Location:

trunk/sources

Files:

• HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Optimization.Views/3.3/RunCollectioComparisonConstraintView.Designer.cs (added)
• HeuristicLab.Optimization.Views/3.3/RunCollectioComparisonConstraintView.cs (added)
• HeuristicLab.Optimization.Views/3.3/RunCollectioComparisonConstraintView.resx (added)
• HeuristicLab.Optimization.Views/3.3/RunCollectionBubbleChartView.cs (modified) (4 diffs)
• HeuristicLab.Optimization.Views/3.3/RunCollectionConstraintCollectionView.Designer.cs (added)
• HeuristicLab.Optimization.Views/3.3/RunCollectionConstraintCollectionView.cs (copied) (copied from trunk/sources/HeuristicLab.Core.Views/3.3/ConstraintCollectionView.cs) (2 diffs)
• HeuristicLab.Optimization.Views/3.3/RunCollectionConstraintView.Designer.cs (added)
• HeuristicLab.Optimization.Views/3.3/RunCollectionConstraintView.cs (added)
• HeuristicLab.Optimization.Views/3.3/RunCollectionEqualityConstraintView.Designer.cs (added)
• HeuristicLab.Optimization.Views/3.3/RunCollectionEqualityConstraintView.cs (added)
• HeuristicLab.Optimization.Views/3.3/RunCollectionTabularView.cs (modified) (3 diffs)
• HeuristicLab.Optimization.Views/3.3/RunCollectionTypeCompatibilityConstraintView.Designer.cs (added)
• HeuristicLab.Optimization.Views/3.3/RunCollectionTypeCompatibilityConstraintView.cs (added)
• HeuristicLab.Optimization.Views/3.3/RunCollectionView.Designer.cs (modified) (9 diffs)
• HeuristicLab.Optimization.Views/3.3/RunCollectionView.cs (modified) (8 diffs)
• HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/IRunCollectionConstraint.cs (added)
• HeuristicLab.Optimization/3.3/RunCollection.cs (modified) (5 diffs)
• HeuristicLab.Optimization/3.3/RunCollectionComparisonConstraint.cs (added)
• HeuristicLab.Optimization/3.3/RunCollectionConstraintCollection.cs (added)
• HeuristicLab.Optimization/3.3/RunCollectionEqualityConstraint.cs (added)
• HeuristicLab.Optimization/3.3/RunCollectionTypeCompatiblityConstraint.cs (added)

trunk/sources/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj

@@ -100 +100 @@
       <DependentUpon>BatchRunView.cs</DependentUpon>
     </Compile>
+    <Compile Include="RunCollectioComparisonConstraintView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="RunCollectioComparisonConstraintView.Designer.cs">
+      <DependentUpon>RunCollectioComparisonConstraintView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="RunCollectionTypeCompatibilityConstraintView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="RunCollectionTypeCompatibilityConstraintView.Designer.cs">
+      <DependentUpon>RunCollectionTypeCompatibilityConstraintView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="RunCollectionConstraintCollectionView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="RunCollectionConstraintCollectionView.Designer.cs">
+      <DependentUpon>RunCollectionConstraintCollectionView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="RunCollectionConstraintView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="RunCollectionConstraintView.Designer.cs">
+      <DependentUpon>RunCollectionConstraintView.cs</DependentUpon>
+    </Compile>
     <Compile Include="OptimizerListView.cs">
       <SubType>UserControl</SubType>
@@ -117 +141 @@
     <Compile Include="RunCollectionBubbleChartView.Designer.cs">
       <DependentUpon>RunCollectionBubbleChartView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="RunCollectionEqualityConstraintView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="RunCollectionEqualityConstraintView.Designer.cs">
+      <DependentUpon>RunCollectionEqualityConstraintView.cs</DependentUpon>
     </Compile>
     <Compile Include="RunCollectionTabularView.cs">
@@ -222 +252 @@
       <Name>HeuristicLab.PluginInfrastructure</Name>
     </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="RunCollectioComparisonConstraintView.resx">
+      <DependentUpon>RunCollectioComparisonConstraintView.cs</DependentUpon>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionBubbleChartView.cs

@@ -63 +63 @@
       this.isSelecting = false;
 
-
       this.chart.ChartAreas[0].CursorX.IsUserSelectionEnabled = true;
       this.chart.ChartAreas[0].CursorY.IsUserSelectionEnabled = true;
@@ -122 +121 @@
     private void run_Changed(object sender, EventArgs e) {
       IRun run = (IRun)sender;
+      UpdateRun(run);
+    }
+
+    private void UpdateRun(IRun run) {
       DataPoint point = this.chart.Series[0].Points.Where(p => p.Tag == run).SingleOrDefault();
       if (point != null) {
@@ -129 +132 @@
       } else
         AddDataPoint(run);
+
+      if (this.chart.Series[0].Points.Count == 0)
+        noRunsLabel.Visible = true;
+      else
+        noRunsLabel.Visible = false;
     }
 
@@ -136 +144 @@
       UpdateComboBoxes();
       UpdateDataPoints();
+      foreach(IRun run in Content) 
+        UpdateRun(run);
     }
     private void Content_ColumnNamesChanged(object sender, EventArgs e) {

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionConstraintCollectionView.cs

@@ -24 +24 @@
 using HeuristicLab.Collections;
 using HeuristicLab.MainForm;
+using HeuristicLab.Optimization;
+using System.Drawing;
 
 namespace HeuristicLab.Core.Views {
   [View("ConstraintCollection View")]
-  [Content(typeof(ConstraintCollection), true)]
-  [Content(typeof(IItemCollection<IConstraint>), false)]
-  public partial class ConstraintCollectionView : ItemCollectionView<IConstraint> {
+  [Content(typeof(RunCollectionConstraintCollection), true)]
+  [Content(typeof(IItemCollection<IRunCollectionConstraint>), false)]
+  public partial class RunCollectionConstraintCollectionView : ItemCollectionView<IRunCollectionConstraint> {
     protected CreateParameterDialog createParameterDialog;
     /// <summary>
     /// Initializes a new instance of <see cref="VariablesScopeView"/> with caption "Variables Scope View".
     /// </summary>
-    public ConstraintCollectionView() {
+    public RunCollectionConstraintCollectionView() {
       InitializeComponent();
-      Caption = "ConstraintCollection";
-      itemsGroupBox.Text = "Constraints";
+      Caption = "RunCollectionConstraintCollection";
+      itemsGroupBox.Text = "RunCollection Constraints";
     }
 
-    protected override IConstraint CreateItem() {
+    protected override IRunCollectionConstraint CreateItem() {
       if (typeSelectorDialog == null) {
         typeSelectorDialog = new TypeSelectorDialog();
-        typeSelectorDialog.Caption = "Select Operator";
-        typeSelectorDialog.TypeSelector.Caption = "Available Operators";
-        typeSelectorDialog.TypeSelector.Configure(typeof(IConstraint), false, true);
+        typeSelectorDialog.Caption = "Select RunCollection Constraint";
+        typeSelectorDialog.TypeSelector.Caption = "Available Constraints";
+        typeSelectorDialog.TypeSelector.Configure(typeof(IRunCollectionConstraint), false, true);
       }
 
       if (typeSelectorDialog.ShowDialog(this) == DialogResult.OK) {
         try {
-          return (IConstraint)typeSelectorDialog.TypeSelector.CreateInstanceOfSelectedType();
+          return (IRunCollectionConstraint)typeSelectorDialog.TypeSelector.CreateInstanceOfSelectedType();
         }
         catch (Exception ex) {
@@ -58 +60 @@
       return null;
     }
+
+    protected override void RegisterContentEvents() {
+      base.RegisterContentEvents();
+      foreach (IRunCollectionConstraint constraint in Content)
+        constraint.ActiveChanged += new EventHandler(constraint_ActiveChanged);
+    }
+    protected override void DeregisterContentEvents() {
+      base.DeregisterContentEvents();
+      foreach (IRunCollectionConstraint constraint in Content)
+        constraint.ActiveChanged -= new EventHandler(constraint_ActiveChanged);
+    }
+    protected override void Content_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IRunCollectionConstraint> e) {
+      base.Content_ItemsAdded(sender, e);
+      foreach (IRunCollectionConstraint constraint in e.Items)
+        constraint.ActiveChanged += new EventHandler(constraint_ActiveChanged);
+    }
+    protected override void Content_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IRunCollectionConstraint> e) {
+      base.Content_ItemsRemoved(sender, e);
+      foreach (IRunCollectionConstraint constraint in e.Items)
+        constraint.ActiveChanged -= new EventHandler(constraint_ActiveChanged);
+    }
+    protected override void Content_CollectionReset(object sender, CollectionItemsChangedEventArgs<IRunCollectionConstraint> e) {
+      base.Content_CollectionReset(sender, e);
+      foreach (IRunCollectionConstraint constraint in e.OldItems)
+        constraint.ActiveChanged -= new EventHandler(constraint_ActiveChanged);
+      foreach (IRunCollectionConstraint constraint in e.Items)
+        constraint.ActiveChanged += new EventHandler(constraint_ActiveChanged);
+    }
+
+    protected virtual void constraint_ActiveChanged(object sender, EventArgs e) {
+      IRunCollectionConstraint constraint = sender as IRunCollectionConstraint;
+      if (constraint != null) {
+        foreach (ListViewItem listViewItem in GetListViewItemsForItem(constraint)) {
+          if (constraint.Active)
+            listViewItem.Font = new Font(listViewItem.Font, FontStyle.Bold);
+          else
+            listViewItem.Font = new Font(listViewItem.Font, FontStyle.Regular);
+        }
+      }
+    }
+
+
   }
 }

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionTabularView.cs

@@ -54 +54 @@
     }
 
+    protected override void OnContentChanged() {
+      base.OnContentChanged();
+      if (Content != null) {
+        foreach (IRun run in Content)
+          UpdateRun(run);
+      }
+    }
+
     protected override void RegisterContentEvents() {
       base.RegisterContentEvents();
@@ -88 +96 @@
     private void run_Changed(object sender, EventArgs e) {
       IRun run = (IRun)sender;
+      UpdateRun(run);
+    }
+
+    private void UpdateRun(IRun run) {
       int rowIndex = Content.ToList().IndexOf(run);
       rowIndex = virtualRowIndizes[rowIndex];
@@ -104 +116 @@
       }
     }
-
 
     protected override int[] Sort(IEnumerable<KeyValuePair<int, SortOrder>> sortedColumns) {

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionView.Designer.cs

@@ -54 +54 @@
     private void InitializeComponent() {
       this.components = new System.ComponentModel.Container();
+      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RunCollectionView));
       this.splitContainer = new System.Windows.Forms.SplitContainer();
+      this.toolStrip = new System.Windows.Forms.ToolStrip();
+      this.analyzeRunsToolStripDropDownButton = new System.Windows.Forms.ToolStripDropDownButton();
       this.itemsListView = new System.Windows.Forms.ListView();
       this.columnHeader1 = new System.Windows.Forms.ColumnHeader();
@@ -63 +66 @@
       this.itemsGroupBox = new System.Windows.Forms.GroupBox();
       this.toolTip = new System.Windows.Forms.ToolTip(this.components);
-      this.toolStrip = new System.Windows.Forms.ToolStrip();
-      this.analyzeRunsToolStripDropDownButton = new System.Windows.Forms.ToolStripDropDownButton();
+      this.tabControl = new System.Windows.Forms.TabControl();
+      this.runPage = new System.Windows.Forms.TabPage();
+      this.constraintPage = new System.Windows.Forms.TabPage();
+      this.runCollectionConstraintCollectionView = new HeuristicLab.Core.Views.RunCollectionConstraintCollectionView();
       this.splitContainer.Panel1.SuspendLayout();
       this.splitContainer.Panel2.SuspendLayout();
       this.splitContainer.SuspendLayout();
+      this.toolStrip.SuspendLayout();
       this.detailsGroupBox.SuspendLayout();
       this.itemsGroupBox.SuspendLayout();
-      this.toolStrip.SuspendLayout();
+      this.tabControl.SuspendLayout();
+      this.runPage.SuspendLayout();
+      this.constraintPage.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -90 +98 @@
       // 
       this.splitContainer.Panel2.Controls.Add(this.detailsGroupBox);
-      this.splitContainer.Size = new System.Drawing.Size(526, 364);
+      this.splitContainer.Size = new System.Drawing.Size(512, 332);
       this.splitContainer.SplitterDistance = 250;
       this.splitContainer.TabIndex = 0;
+      // 
+      // toolStrip
+      // 
+      this.toolStrip.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.toolStrip.AutoSize = false;
+      this.toolStrip.Dock = System.Windows.Forms.DockStyle.None;
+      this.toolStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
+      this.toolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.analyzeRunsToolStripDropDownButton});
+      this.toolStrip.Location = new System.Drawing.Point(30, 3);
+      this.toolStrip.Name = "toolStrip";
+      this.toolStrip.Size = new System.Drawing.Size(217, 24);
+      this.toolStrip.TabIndex = 1;
+      this.toolStrip.Text = "toolStrip1";
+      // 
+      // analyzeRunsToolStripDropDownButton
+      // 
+      this.analyzeRunsToolStripDropDownButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+      this.analyzeRunsToolStripDropDownButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+      this.analyzeRunsToolStripDropDownButton.Name = "analyzeRunsToolStripDropDownButton";
+      this.analyzeRunsToolStripDropDownButton.Size = new System.Drawing.Size(99, 21);
+      this.analyzeRunsToolStripDropDownButton.Text = "&Analyze Runs...";
+      this.analyzeRunsToolStripDropDownButton.ToolTipText = "Show Run Analysis Views";
       // 
       // itemsListView
@@ -107 +139 @@
       this.itemsListView.Name = "itemsListView";
       this.itemsListView.ShowItemToolTips = true;
-      this.itemsListView.Size = new System.Drawing.Size(244, 327);
+      this.itemsListView.Size = new System.Drawing.Size(244, 295);
       this.itemsListView.SmallImageList = this.imageList;
       this.itemsListView.TabIndex = 1;
@@ -147 +179 @@
       this.detailsGroupBox.Location = new System.Drawing.Point(3, 27);
       this.detailsGroupBox.Name = "detailsGroupBox";
-      this.detailsGroupBox.Size = new System.Drawing.Size(266, 335);
+      this.detailsGroupBox.Size = new System.Drawing.Size(252, 303);
       this.detailsGroupBox.TabIndex = 0;
       this.detailsGroupBox.TabStop = false;
@@ -162 +194 @@
       this.viewHost.Name = "viewHost";
       this.viewHost.ReadOnly = false;
-      this.viewHost.Size = new System.Drawing.Size(254, 310);
+      this.viewHost.Size = new System.Drawing.Size(240, 278);
       this.viewHost.TabIndex = 0;
       this.viewHost.ViewType = null;
@@ -170 +202 @@
       this.itemsGroupBox.Controls.Add(this.splitContainer);
       this.itemsGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.itemsGroupBox.Location = new System.Drawing.Point(0, 0);
+      this.itemsGroupBox.Location = new System.Drawing.Point(3, 3);
       this.itemsGroupBox.Name = "itemsGroupBox";
-      this.itemsGroupBox.Size = new System.Drawing.Size(532, 383);
+      this.itemsGroupBox.Size = new System.Drawing.Size(518, 351);
       this.itemsGroupBox.TabIndex = 0;
       this.itemsGroupBox.TabStop = false;
       this.itemsGroupBox.Text = "Items";
       // 
-      // toolStrip
-      // 
-      this.toolStrip.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.toolStrip.AutoSize = false;
-      this.toolStrip.Dock = System.Windows.Forms.DockStyle.None;
-      this.toolStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
-      this.toolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.analyzeRunsToolStripDropDownButton});
-      this.toolStrip.Location = new System.Drawing.Point(30, 3);
-      this.toolStrip.Name = "toolStrip";
-      this.toolStrip.RenderMode = System.Windows.Forms.ToolStripRenderMode.ManagerRenderMode;
-      this.toolStrip.Size = new System.Drawing.Size(217, 24);
-      this.toolStrip.TabIndex = 1;
-      this.toolStrip.Text = "toolStrip1";
-      // 
-      // analyzeRunsToolStripDropDownButton
-      // 
-      this.analyzeRunsToolStripDropDownButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
-      this.analyzeRunsToolStripDropDownButton.ImageTransparentColor = System.Drawing.Color.Magenta;
-      this.analyzeRunsToolStripDropDownButton.Name = "analyzeRunsToolStripDropDownButton";
-      this.analyzeRunsToolStripDropDownButton.Size = new System.Drawing.Size(45, 21);
-      this.analyzeRunsToolStripDropDownButton.Text = "&Analyze Runs...";
-      this.analyzeRunsToolStripDropDownButton.ToolTipText = "Show Run Analysis Views";
+      // tabControl
+      // 
+      this.tabControl.Controls.Add(this.runPage);
+      this.tabControl.Controls.Add(this.constraintPage);
+      this.tabControl.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.tabControl.Location = new System.Drawing.Point(0, 0);
+      this.tabControl.Name = "tabControl";
+      this.tabControl.SelectedIndex = 0;
+      this.tabControl.Size = new System.Drawing.Size(532, 383);
+      this.tabControl.TabIndex = 1;
+      // 
+      // runPage
+      // 
+      this.runPage.Controls.Add(this.itemsGroupBox);
+      this.runPage.Location = new System.Drawing.Point(4, 22);
+      this.runPage.Name = "runPage";
+      this.runPage.Padding = new System.Windows.Forms.Padding(3);
+      this.runPage.Size = new System.Drawing.Size(524, 357);
+      this.runPage.TabIndex = 0;
+      this.runPage.Text = "Runs";
+      this.runPage.UseVisualStyleBackColor = true;
+      // 
+      // constraintPage
+      // 
+      this.constraintPage.Controls.Add(this.runCollectionConstraintCollectionView);
+      this.constraintPage.Location = new System.Drawing.Point(4, 22);
+      this.constraintPage.Name = "constraintPage";
+      this.constraintPage.Padding = new System.Windows.Forms.Padding(3);
+      this.constraintPage.Size = new System.Drawing.Size(524, 357);
+      this.constraintPage.TabIndex = 1;
+      this.constraintPage.Text = "Filtering";
+      this.constraintPage.UseVisualStyleBackColor = true;
+      // 
+      // runCollectionConstraintCollectionView
+      // 
+      this.runCollectionConstraintCollectionView.Caption = "Filter";
+      this.runCollectionConstraintCollectionView.Content = null;
+      this.runCollectionConstraintCollectionView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.runCollectionConstraintCollectionView.Location = new System.Drawing.Point(3, 3);
+      this.runCollectionConstraintCollectionView.Name = "runCollectionConstraintCollectionView";
+      this.runCollectionConstraintCollectionView.ReadOnly = false;
+      this.runCollectionConstraintCollectionView.Size = new System.Drawing.Size(518, 351);
+      this.runCollectionConstraintCollectionView.TabIndex = 0;
       // 
       // RunCollectionView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-      this.Controls.Add(this.itemsGroupBox);
+      this.Controls.Add(this.tabControl);
       this.Name = "RunCollectionView";
       this.Size = new System.Drawing.Size(532, 383);
@@ -211 +262 @@
       this.splitContainer.Panel2.ResumeLayout(false);
       this.splitContainer.ResumeLayout(false);
+      this.toolStrip.ResumeLayout(false);
+      this.toolStrip.PerformLayout();
       this.detailsGroupBox.ResumeLayout(false);
       this.itemsGroupBox.ResumeLayout(false);
-      this.toolStrip.ResumeLayout(false);
-      this.toolStrip.PerformLayout();
+      this.tabControl.ResumeLayout(false);
+      this.runPage.ResumeLayout(false);
+      this.constraintPage.ResumeLayout(false);
       this.ResumeLayout(false);
 
@@ -232 +286 @@
     protected ToolStrip toolStrip;
     protected ToolStripDropDownButton analyzeRunsToolStripDropDownButton;
+    private TabControl tabControl;
+    private TabPage runPage;
+    private TabPage constraintPage;
+    private HeuristicLab.Core.Views.RunCollectionConstraintCollectionView runCollectionConstraintCollectionView;
   }
 }

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionView.cs

@@ -42 +42 @@
     }
 
+    public RunCollection RunCollection {
+      get { return Content as RunCollection; }
+    }
+
     public ListView ItemsListView {
       get { return itemsListView; }
@@ -94 +98 @@
       while (itemsListView.Items.Count > 0) RemoveListViewItem(itemsListView.Items[0]);
       viewHost.Content = null;
+      runCollectionConstraintCollectionView.Content = null;
+      tabControl.TabPages.Remove(constraintPage);
 
       if (Content != null) {
+        if (RunCollection != null) {
+          tabControl.TabPages.Add(constraintPage);
+          runCollectionConstraintCollectionView.Content = RunCollection.Constraints;
+          runCollectionConstraintCollectionView.ReadOnly = itemsListView.Items.Count == 0;
+        }
         Caption += " (" + Content.GetType().Name + ")";
-        foreach (IRun item in Content)
+        foreach (IRun item in Content) {
           AddListViewItem(CreateListViewItem(item));
+          UpdateRun(item);
+        }
       }
       SetEnabledStateOfControls();
@@ -110 +123 @@
       if (Content == null) {
         analyzeRunsToolStripDropDownButton.Enabled = false;
+        runCollectionConstraintCollectionView.ReadOnly = true;
         itemsListView.Enabled = false;
         detailsGroupBox.Enabled = false;
@@ -116 +130 @@
       } else {
         analyzeRunsToolStripDropDownButton.Enabled = itemsListView.Items.Count > 0;
+        runCollectionConstraintCollectionView.ReadOnly = itemsListView.Items.Count == 0;
         itemsListView.Enabled = true;
         detailsGroupBox.Enabled = true;
@@ -262 +277 @@
           AddListViewItem(CreateListViewItem(item));
         analyzeRunsToolStripDropDownButton.Enabled = itemsListView.Items.Count > 0;
+        runCollectionConstraintCollectionView.ReadOnly = itemsListView.Items.Count == 0;
       }
     }
@@ -276 +292 @@
         }
         analyzeRunsToolStripDropDownButton.Enabled = itemsListView.Items.Count > 0;
+        runCollectionConstraintCollectionView.ReadOnly = itemsListView.Items.Count == 0;
       }
     }
@@ -293 +310 @@
           AddListViewItem(CreateListViewItem(item));
         analyzeRunsToolStripDropDownButton.Enabled = itemsListView.Items.Count > 0;
+        runCollectionConstraintCollectionView.ReadOnly = itemsListView.Items.Count == 0;
       }
     }
@@ -318 +336 @@
     protected virtual void Run_Changed(object sender, EventArgs e) {
       IRun run = (IRun)sender;
+      UpdateRun(run);
+    }
+
+    protected virtual void UpdateRun(IRun run) {
       foreach (ListViewItem listViewItem in GetListViewItemsForItem(run)) {
         if (run.Visible) {

trunk/sources/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

@@ -87 +87 @@
     <Compile Include="Algorithm.cs" />
     <Compile Include="BatchRun.cs" />
+    <Compile Include="RunCollectionComparisonConstraint.cs" />
+    <Compile Include="RunCollectionConstraintCollection.cs" />
+    <Compile Include="RunCollectionTypeCompatiblityConstraint.cs" />
+    <Compile Include="RunCollectionEqualityConstraint.cs" />
     <Compile Include="Interfaces\ISingleObjectiveReplacer.cs" />
     <Compile Include="Interfaces\IMigrator.cs" />
@@ -97 +101 @@
     <Compile Include="Interfaces\IStrategyParameterCreator.cs" />
     <Compile Include="Interfaces\IRun.cs" />
+    <Compile Include="IRunCollectionConstraint.cs" />
     <Compile Include="OptimizerList.cs" />
     <Compile Include="Experiment.cs" />

trunk/sources/HeuristicLab.Optimization/3.3/RunCollection.cs

@@ -27 +27 @@
 using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Collections;
 
 namespace HeuristicLab.Optimization {
@@ -38 +39 @@
       parameterNames = new List<string>();
       resultNames = new List<string>();
-    }
-
-    protected static Type[] viewableDataTypes = new Type[]{typeof(BoolValue), typeof(DoubleValue), typeof(IntValue),
-      typeof(PercentValue), typeof(StringValue)};
+      dataTypes = new Dictionary<string, HashSet<Type>>();
+      constraints = new RunCollectionConstraintCollection();
+      constraints.ItemsAdded += new CollectionItemsChangedEventHandler<IRunCollectionConstraint>(Constraints_ItemsAdded);
+      constraints.ItemsRemoved += new CollectionItemsChangedEventHandler<IRunCollectionConstraint>(Constraints_ItemsRemoved);
+      constraints.CollectionReset += new CollectionItemsChangedEventHandler<IRunCollectionConstraint>(Constraints_CollectionReset);
+    }
+    private Dictionary<string, HashSet<Type>> dataTypes;
+    public IEnumerable<Type> GetDataType(string columnName) {
+      if (!dataTypes.ContainsKey(columnName))
+        return new Type[0];
+      return dataTypes[columnName];
+    }
+    private RunCollectionConstraintCollection constraints;
+    public RunCollectionConstraintCollection Constraints {
+      get { return constraints;}
+    }
 
     protected override void OnCollectionReset(IEnumerable<IRun> items, IEnumerable<IRun> oldItems) {
@@ -90 +103 @@
         return false;
       if (!parameterNames.Contains(name)) {
-        // && viewableDataTypes.Any(x => x.IsAssignableFrom(value.GetType()))) {
         parameterNames.Add(name);
-        return true;
-      }
+        dataTypes[name] = new HashSet<Type>();
+        dataTypes[name].Add(value.GetType());
+        return true;
+      }
+      dataTypes[name].Add(value.GetType());
       return false;
     }
@@ -100 +115 @@
         return false;
       if (!resultNames.Contains(name)) {
-        // && viewableDataTypes.Any(x => x.IsAssignableFrom(value.GetType()))) {
         resultNames.Add(name);
-        return true;
-      }
+        dataTypes[name] = new HashSet<Type>();
+        dataTypes[name].Add(value.GetType());
+        return true;
+      }
+      dataTypes[name].Add(value.GetType());
       return false;
     }
@@ -221 +238 @@
     public bool SetValue(string value, int rowIndex, int columnIndex) { throw new NotSupportedException(); }
     #endregion
+
+    #region filtering
+    private void UpdateFiltering() {
+      list.ForEach(r => r.Visible = true);
+      foreach (IRunCollectionConstraint constraint in this.constraints)
+        constraint.Check();
+    }
+
+    protected virtual void RegisterConstraintEvents(IEnumerable<IRunCollectionConstraint> constraints) {
+      foreach (IRunCollectionConstraint constraint in constraints) {
+        constraint.ActiveChanged += new EventHandler(Constraint_ActiveChanged);
+        constraint.ConstrainedValueChanged += new EventHandler(Constraint_ConstrainedValueChanged);
+        constraint.ConstraintOperationChanged += new EventHandler(Constraint_ConstraintOperationChanged);
+        constraint.ConstraintDataChanged += new EventHandler(Constraint_ConstraintDataChanged);
+      }
+    }
+    protected virtual void DeregisterConstraintEvents(IEnumerable<IRunCollectionConstraint> constraints) {
+      foreach (IRunCollectionConstraint constraint in constraints) {
+        constraint.ActiveChanged -= new EventHandler(Constraint_ActiveChanged);
+        constraint.ConstrainedValueChanged -= new EventHandler(Constraint_ConstrainedValueChanged);
+        constraint.ConstraintOperationChanged -= new EventHandler(Constraint_ConstraintOperationChanged);
+        constraint.ConstraintDataChanged -= new EventHandler(Constraint_ConstraintDataChanged);
+      }
+    }
+
+    protected virtual void Constraints_CollectionReset(object sender, CollectionItemsChangedEventArgs<IRunCollectionConstraint> e) {
+      DeregisterConstraintEvents(e.OldItems);
+      RegisterConstraintEvents(e.Items);
+      this.UpdateFiltering();
+    }
+    protected virtual void Constraints_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IRunCollectionConstraint> e) {
+      RegisterConstraintEvents(e.Items);
+      foreach (IRunCollectionConstraint constraint in e.Items)
+        constraint.ConstrainedValue = this;
+      this.UpdateFiltering();
+    }
+    protected virtual void Constraints_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IRunCollectionConstraint> e) {
+      DeregisterConstraintEvents(e.Items);
+      this.UpdateFiltering();
+    }
+    protected virtual void Constraint_ActiveChanged(object sender, EventArgs e) {
+      this.UpdateFiltering();
+    }
+    protected virtual void Constraint_ConstrainedValueChanged(object sender, EventArgs e) {
+      //mkommend: this method is intentionally left empty, because the constrainedValue is set in the ItemsAdded method
+    }
+    protected virtual void Constraint_ConstraintOperationChanged(object sender, EventArgs e) {
+      this.UpdateFiltering();
+    }
+    protected virtual void Constraint_ConstraintDataChanged(object sender, EventArgs e) {
+      this.UpdateFiltering();
+    }
+    #endregion
   }
 }