Changeset 2845

Timestamp:

02/20/10 20:04:08 (14 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• worked on parameterized items

Location:

trunk/sources

Files:

• HeuristicLab.Common/3.2/EventArgs.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/HeuristicLab.Core.Views-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Core.Views/3.3/ParameterizedNamedItemView.Designer.cs (added)
• HeuristicLab.Core.Views/3.3/ParameterizedNamedItemView.cs (added)
• HeuristicLab.Core/3.3/HeuristicLab.Core-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Core/3.3/Interfaces/IOperator.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/IParameterizedNamedItem.cs (added)
• HeuristicLab.Core/3.3/ParameterizedNamedItem.cs (added)
• HeuristicLab.Operators.Views/3.3/OperatorView.Designer.cs (modified) (4 diffs)
• HeuristicLab.Operators.Views/3.3/OperatorView.cs (modified) (3 diffs)
• HeuristicLab.Operators/3.3/Operator.cs (modified) (6 diffs)
• HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/HeuristicLabOptimizationPlugin.cs.frame (modified) (1 diff)
• HeuristicLab.Optimization/3.3/IAlgorithm.cs (added)
• HeuristicLab.Optimization/3.3/IProblem.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Problem.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Common/3.2/EventArgs.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace HeuristicLab.Common {

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

@@ -70 +70 @@
   <ItemGroup>
     <None Include="HeuristicLabCoreViewsPlugin.cs.frame" />
+    <Compile Include="OperatorTreeView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="OperatorTreeView.Designer.cs">
+      <DependentUpon>OperatorTreeView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="ParameterizedNamedItemView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ParameterizedNamedItemView.Designer.cs">
+      <DependentUpon>ParameterizedNamedItemView.cs</DependentUpon>
+    </Compile>
     <Compile Include="ValueParameterCollectionView.cs">
       <SubType>UserControl</SubType>
@@ -124 +136 @@
     <Compile Include="OperatorsSidebar.Designer.cs">
       <DependentUpon>OperatorsSidebar.cs</DependentUpon>
-    </Compile>
-    <Compile Include="OperatorTreeView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="OperatorTreeView.Designer.cs">
-      <DependentUpon>OperatorTreeView.cs</DependentUpon>
     </Compile>
     <Compile Include="TypeSelectorDialog.cs">

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

@@ -104 +104 @@
     <Compile Include="ChangedEventArgs.cs" />
     <None Include="HeuristicLabCorePlugin.cs.frame" />
+    <Compile Include="Interfaces\IParameterizedNamedItem.cs" />
     <Compile Include="Interfaces\IParameterizedItem.cs" />
     <Compile Include="Interfaces\IAtomicOperation.cs" />
@@ -109 +110 @@
     <Compile Include="Interfaces\IOperation.cs" />
     <Compile Include="OperationCollection.cs" />
+    <Compile Include="ParameterizedNamedItem.cs" />
     <Compile Include="ValueParameterCollection.cs" />
     <Compile Include="Interfaces\IValueLookupParameter.cs" />

trunk/sources/HeuristicLab.Core/3.3/Interfaces/IOperator.cs

@@ -27 +27 @@
   /// a basic instruction of an algorithm.
   /// </summary>
-  public interface IOperator : INamedItem, IParameterizedItem {
+  public interface IOperator : IParameterizedNamedItem {
     /// <summary>
     /// Gets or sets a boolean value whether the engine should stop here during the run.

trunk/sources/HeuristicLab.Operators.Views/3.3/OperatorView.Designer.cs

@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
-      this.parameterCollectionView = new HeuristicLab.Core.Views.ParameterCollectionView();
+      this.breakpointLabel = new System.Windows.Forms.Label();
+      this.breakpointCheckBox = new System.Windows.Forms.CheckBox();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.SuspendLayout();
+      // 
+      // parameterCollectionView
+      // 
+      this.parameterCollectionView.Location = new System.Drawing.Point(0, 139);
+      this.parameterCollectionView.Size = new System.Drawing.Size(490, 214);
+      this.parameterCollectionView.TabIndex = 6;
       // 
       // nameTextBox
@@ -53 +60 @@
       this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
       this.errorProvider.SetIconPadding(this.nameTextBox, 2);
-      this.nameTextBox.Size = new System.Drawing.Size(418, 20);
       // 
-      // descriptionTextBox
+      // breakpointLabel
       // 
-      this.descriptionTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.descriptionTextBox.Size = new System.Drawing.Size(418, 87);
+      this.breakpointLabel.AutoSize = true;
+      this.breakpointLabel.Location = new System.Drawing.Point(3, 120);
+      this.breakpointLabel.Name = "breakpointLabel";
+      this.breakpointLabel.Size = new System.Drawing.Size(61, 13);
+      this.breakpointLabel.TabIndex = 4;
+      this.breakpointLabel.Text = "&Breakpoint:";
       // 
-      // parameterCollectionView
+      // breakpointCheckBox
       // 
-      this.parameterCollectionView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                  | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.parameterCollectionView.Caption = "ParameterCollection";
-      this.parameterCollectionView.Location = new System.Drawing.Point(0, 119);
-      this.parameterCollectionView.Name = "parameterCollectionView";
-      this.parameterCollectionView.Size = new System.Drawing.Size(490, 234);
-      this.parameterCollectionView.TabIndex = 4;
+      this.breakpointCheckBox.AutoSize = true;
+      this.breakpointCheckBox.Location = new System.Drawing.Point(72, 119);
+      this.breakpointCheckBox.Name = "breakpointCheckBox";
+      this.breakpointCheckBox.Size = new System.Drawing.Size(15, 14);
+      this.breakpointCheckBox.TabIndex = 5;
+      this.breakpointCheckBox.UseVisualStyleBackColor = true;
+      this.breakpointCheckBox.CheckedChanged += new System.EventHandler(this.breakpointCheckBox_CheckedChanged);
       // 
       // OperatorView
@@ -76 +84 @@
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.Controls.Add(this.parameterCollectionView);
+      this.Controls.Add(this.breakpointLabel);
+      this.Controls.Add(this.breakpointCheckBox);
       this.Name = "OperatorView";
-      this.Size = new System.Drawing.Size(490, 353);
+      this.Controls.SetChildIndex(this.breakpointCheckBox, 0);
+      this.Controls.SetChildIndex(this.breakpointLabel, 0);
       this.Controls.SetChildIndex(this.nameTextBox, 0);
       this.Controls.SetChildIndex(this.nameLabel, 0);
@@ -92 +102 @@
     #endregion
 
-    protected HeuristicLab.Core.Views.ParameterCollectionView parameterCollectionView;
+    private System.Windows.Forms.Label breakpointLabel;
+    private System.Windows.Forms.CheckBox breakpointCheckBox;
 
   }

trunk/sources/HeuristicLab.Operators.Views/3.3/OperatorView.cs

@@ -23 +23 @@
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
+using System;
 
 namespace HeuristicLab.Operators.Views {
@@ -30 +31 @@
   [Content(typeof(Operator), true)]
   [Content(typeof(IOperator), false)]
-  public partial class OperatorView : NamedItemView {
+  public partial class OperatorView : ParameterizedNamedItemView {
     public new IOperator Content {
       get { return (IOperator)base.Content; }
@@ -51 +52 @@
     }
 
+    /// <summary>
+    /// Removes the eventhandlers from the underlying <see cref="IOperatorGraph"/>.
+    /// </summary>
+    /// <remarks>Calls <see cref="ViewBase.RemoveItemEvents"/> of base class <see cref="ViewBase"/>.</remarks>
+    protected override void DeregisterContentEvents() {
+      Content.BreakpointChanged -= new EventHandler(Content_BreakpointChanged);
+      base.DeregisterContentEvents();
+    }
+
+    /// <summary>
+    /// Adds eventhandlers to the underlying <see cref="IOperatorGraph"/>.
+    /// </summary>
+    /// <remarks>Calls <see cref="ViewBase.AddItemEvents"/> of base class <see cref="ViewBase"/>.</remarks>
+    protected override void RegisterContentEvents() {
+      base.RegisterContentEvents();
+      Content.BreakpointChanged += new EventHandler(Content_BreakpointChanged);
+    }
+
     protected override void OnContentChanged() {
       base.OnContentChanged();
       if (Content == null) {
-        parameterCollectionView.Content = null;
+        breakpointCheckBox.Checked = false;
+        breakpointCheckBox.Enabled = false;
       } else {
-        parameterCollectionView.Content = ((IOperator)Content).Parameters;
+        breakpointCheckBox.Checked = Content.Breakpoint;
       }
+    }
+
+    private void Content_BreakpointChanged(object sender, EventArgs e) {
+      if (InvokeRequired)
+        Invoke(new EventHandler(Content_DescriptionChanged), sender, e);
+      else
+        breakpointCheckBox.Checked = Content.Breakpoint;
+    }
+
+    private void breakpointCheckBox_CheckedChanged(object sender, System.EventArgs e) {
+      if (Content != null) Content.Breakpoint = breakpointCheckBox.Checked;
     }
   }

trunk/sources/HeuristicLab.Operators/3.3/Operator.cs

@@ -22 +22 @@
 using System;
 using System.Drawing;
-using HeuristicLab.Collections;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -31 +30 @@
   /// </summary>
   [Item("Operator", "Base class for operators.")]
-  public abstract class Operator : NamedItem, IOperator {
+  public abstract class Operator : ParameterizedNamedItem, IOperator {
     public override Image ItemImage {
       get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Method; }
@@ -37 +36 @@
     public override bool CanChangeDescription {
       get { return false; }
-    }
-
-    private ParameterCollection parameters;
-    [Storable]
-    protected ParameterCollection Parameters {
-      get { return parameters;}
-      private set {
-        if (parameters != null) parameters.Changed -= new ChangedEventHandler(Parameters_Changed);
-        parameters = value;
-        readOnlyParameters = null;
-        if (parameters != null) parameters.Changed += new ChangedEventHandler(Parameters_Changed);
-      }
-    }
-    private ReadOnlyObservableKeyedCollection<string, IParameter> readOnlyParameters;
-    IObservableKeyedCollection<string, IParameter> IParameterizedItem.Parameters {
-      get {
-        if (readOnlyParameters == null) readOnlyParameters = parameters.AsReadOnly();
-        return readOnlyParameters;
-      }
     }
 
@@ -103 +83 @@
     /// the canceled flag to <c>false</c> and the name of the operator to the type name. 
     /// </summary>
-    protected Operator() {
-      Name = ItemName;
-      Parameters = new ParameterCollection();
-      readOnlyParameters = null;
+    protected Operator()
+      : base() {
+      canceled = false;
+      breakpoint = false;
+    }
+    protected Operator(string name)
+      : base(name) {
+      canceled = false;
+      breakpoint = false;
+    }
+    protected Operator(string name, ParameterCollection parameters)
+      : base(name, parameters) {
+      canceled = false;
+      breakpoint = false;
+    }
+    protected Operator(string name, string description)
+      : base(name, description) {
+      canceled = false;
+      breakpoint = false;
+    }
+    protected Operator(string name, string description, ParameterCollection parameters)
+      : base(name, description, parameters) {
       canceled = false;
       breakpoint = false;
@@ -119 +117 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       Operator clone = (Operator)base.Clone(cloner);
-      clone.Parameters = (ParameterCollection)cloner.Clone(parameters);
       clone.canceled = canceled;
       clone.breakpoint = breakpoint;
@@ -178 +175 @@
       }
     }
-
-    private void Parameters_Changed(object sender, ChangedEventArgs e) {
-      OnChanged(e);
-    }
   }
 }

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

@@ -51 +51 @@
   <ItemGroup>
     <None Include="HeuristicLabOptimizationPlugin.cs.frame" />
+    <Compile Include="IAlgorithm.cs" />
     <Compile Include="HeuristicLabOptimizationPlugin.cs" />
     <Compile Include="IProblem.cs" />
@@ -68 +69 @@
       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
       <Name>HeuristicLab.Common.Resources-3.2</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Common\3.2\HeuristicLab.Common-3.2.csproj">
+      <Project>{1FC004FC-59AF-4249-B1B6-FF25873A20E4}</Project>
+      <Name>HeuristicLab.Common-3.2</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">

trunk/sources/HeuristicLab.Optimization/3.3/HeuristicLabOptimizationPlugin.cs.frame

@@ -29 +29 @@
   [PluginFile("HeuristicLab.Optimization-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Collections", "3.3")]
+  [PluginDependency("HeuristicLab.Common", "3.2")]
   [PluginDependency("HeuristicLab.Common.Resources", "3.2")]
   [PluginDependency("HeuristicLab.Core", "3.3")]

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

@@ -26 +26 @@
   /// Interface to represent a problem.
   /// </summary>
-  public interface IProblem : INamedItem, IParameterizedItem { }
+  public interface IProblem : IParameterizedNamedItem { }
 }

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

@@ -21 +21 @@
 
 using System.Drawing;
-using HeuristicLab.Collections;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Optimization {
@@ -30 +28 @@
   /// </summary>
   [Item("Problem", "Base class for problems.")]
-  public abstract class Problem : NamedItem, IProblem {
+  public abstract class Problem : ParameterizedNamedItem, IProblem {
     public override Image ItemImage {
       get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Type; }
     }
 
-    private ParameterCollection parameters;
-    [Storable]
-    protected ParameterCollection Parameters {
-      get { return parameters;}
-      private set {
-        if (parameters != null) parameters.Changed -= new ChangedEventHandler(Parameters_Changed);
-        parameters = value;
-        readOnlyParameters = null;
-        if (parameters != null) parameters.Changed += new ChangedEventHandler(Parameters_Changed);
-      }
-    }
-    private ReadOnlyObservableKeyedCollection<string, IParameter> readOnlyParameters;
-    IObservableKeyedCollection<string, IParameter> IParameterizedItem.Parameters {
-      get {
-        if (readOnlyParameters == null) readOnlyParameters = parameters.AsReadOnly();
-        return readOnlyParameters;
-      }
-    }
-
-    protected Problem() {
-      Name = ItemName;
-      Parameters = new ParameterCollection();
-      readOnlyParameters = null;
-    }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      Problem clone = (Problem)base.Clone(cloner);
-      clone.Parameters = (ParameterCollection)cloner.Clone(parameters);
-      return clone;
-    }
-
-    private void Parameters_Changed(object sender, ChangedEventArgs e) {
-      OnChanged(e);
-    }
+    protected Problem() : base() { }
+    protected Problem(string name) : base(name) { }
+    protected Problem(string name, ParameterCollection parameters) : base(name, parameters) { }
+    protected Problem(string name, string description) : base(name, description) { }
+    protected Problem(string name, string description, ParameterCollection parameters) : base(name, description, parameters) { }
   }
 }