Changeset 2947


Ignore:
Timestamp:
03/06/10 00:26:13 (12 years ago)
Author:
swagner
Message:

Operator architecture refactoring (#95)

  • implemented reviewers' comments on version r2917.
Location:
trunk/sources
Files:
1 deleted
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Core.Views/3.3/HeuristicLab.Core.Views-3.3.csproj

    r2917 r2947  
    285285    </ProjectReference>
    286286  </ItemGroup>
    287   <ItemGroup>
    288     <EmbeddedResource Include="OperatorGraphView.resx">
    289       <DependentUpon>OperatorGraphView.cs</DependentUpon>
    290     </EmbeddedResource>
    291   </ItemGroup>
    292287  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    293288  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
  • trunk/sources/HeuristicLab.Core.Views/3.3/NamedItemCollectionView.cs

    r2917 r2947  
    6565      return item;
    6666    }
     67    protected override ListViewItem CreateListViewItem(T item) {
     68      ListViewItem listViewItem = base.CreateListViewItem(item);
     69      listViewItem.ToolTipText = item.ItemName + ": " + item.Description;
     70      return listViewItem;
     71    }
    6772    protected override void AddListViewItem(ListViewItem listViewItem) {
    6873      ListViewItemDictionary.Add((T)listViewItem.Tag, listViewItem);
  • trunk/sources/HeuristicLab.Core.Views/3.3/OperatorGraphView.Designer.cs

    r2924 r2947  
    5151      this.splitContainer = new System.Windows.Forms.SplitContainer();
    5252      this.graphGroupBox = new System.Windows.Forms.GroupBox();
    53       this.viewHost = new HeuristicLab.Core.Views.ViewHost();
     53      this.operatorTreeView = new HeuristicLab.Core.Views.OperatorTreeView();
    5454      this.operatorsContextMenuStrip.SuspendLayout();
    5555      this.splitContainer.Panel1.SuspendLayout();
     
    112112                  | System.Windows.Forms.AnchorStyles.Left)
    113113                  | System.Windows.Forms.AnchorStyles.Right)));
    114       this.graphGroupBox.Controls.Add(this.viewHost);
     114      this.graphGroupBox.Controls.Add(this.operatorTreeView);
    115115      this.graphGroupBox.Location = new System.Drawing.Point(3, 3);
    116116      this.graphGroupBox.Name = "graphGroupBox";
     
    120120      this.graphGroupBox.Text = "Operator Graph";
    121121      //
    122       // viewHost
     122      // operatorTreeView
    123123      //
    124       this.viewHost.Content = null;
    125       this.viewHost.Dock = System.Windows.Forms.DockStyle.Fill;
    126       this.viewHost.Location = new System.Drawing.Point(3, 16);
    127       this.viewHost.Name = "viewHost";
    128       this.viewHost.Size = new System.Drawing.Size(596, 189);
    129       this.viewHost.TabIndex = 0;
     124      this.operatorTreeView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     125                  | System.Windows.Forms.AnchorStyles.Left)
     126                  | System.Windows.Forms.AnchorStyles.Right)));
     127      this.operatorTreeView.Caption = "Operator";
     128      this.operatorTreeView.Content = null;
     129      this.operatorTreeView.Location = new System.Drawing.Point(6, 19);
     130      this.operatorTreeView.Name = "operatorTreeView";
     131      this.operatorTreeView.Size = new System.Drawing.Size(590, 183);
     132      this.operatorTreeView.TabIndex = 0;
    130133      //
    131134      // OperatorGraphView
     
    152155    protected System.Windows.Forms.SplitContainer splitContainer;
    153156    protected System.Windows.Forms.GroupBox graphGroupBox;
    154     private ViewHost viewHost;
     157    private OperatorTreeView operatorTreeView;
    155158  }
    156159}
  • trunk/sources/HeuristicLab.Core.Views/3.3/OperatorGraphView.cs

    r2917 r2947  
    4949      InitializeComponent();
    5050      Caption = "Operator Graph";
    51       this.viewHost.ViewType = typeof(OperatorTreeView);
    5251    }
    5352    /// <summary>
     
    8988      operatorsView.Content = null;
    9089      operatorsView.Enabled = false;
    91       viewHost.Content = null;
    92       viewHost.Enabled = false;
     90      operatorTreeView.Content = null;
     91      operatorTreeView.Enabled = false;
    9392
    9493      if (Content != null) {
     
    9796        operatorsView.Enabled = true;
    9897        MarkInitialOperator();
    99         viewHost.Content = Content.InitialOperator;
    100         viewHost.Enabled = true;
     98        operatorTreeView.Content = Content.InitialOperator;
     99        operatorTreeView.Enabled = true;
    101100      }
    102101    }
     
    140139      else {
    141140        MarkInitialOperator();
    142         viewHost.Content = Content.InitialOperator;
     141        operatorTreeView.Content = Content.InitialOperator;
    143142      }
    144143    }
  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/PermutationCrossover.cs

    r2907 r2947  
    4747      Parameters.Add(new LookupParameter<IRandom>("Random", "The pseudo random number generator which should be used for stochastic crossover operators."));
    4848      Parameters.Add(new SubScopesLookupParameter<Permutation>("Parents", "The parent permutations which should be crossed."));
     49      ParentsParameter.ActualName = "Permutation";
    4950      Parameters.Add(new LookupParameter<Permutation>("Child", "The child permutation resulting from the crossover."));
     51      ChildParameter.ActualName = "Permutation";
    5052    }
    5153
  • trunk/sources/HeuristicLab.Optimization.Views/3.3/UserDefinedAlgorithmView.Designer.cs

    r2916 r2947  
    4545    /// </summary>
    4646    private void InitializeComponent() {
     47      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UserDefinedAlgorithmView));
    4748      this.operatorGraphTabPage = new System.Windows.Forms.TabPage();
    4849      this.saveOperatorGraphButton = new System.Windows.Forms.Button();
     
    6465      // createUserDefinedAlgorithmButton
    6566      //
     67      this.createUserDefinedAlgorithmButton.Enabled = false;
    6668      this.toolTip.SetToolTip(this.createUserDefinedAlgorithmButton, "Create User Defined Algorithm from this Algorithm");
     69      this.createUserDefinedAlgorithmButton.Visible = false;
    6770      //
    6871      // tabControl
     
    114117      this.operatorGraphTabPage.Location = new System.Drawing.Point(4, 22);
    115118      this.operatorGraphTabPage.Name = "operatorGraphTabPage";
    116       this.operatorGraphTabPage.Size = new System.Drawing.Size(705, 374);
     119      this.operatorGraphTabPage.Size = new System.Drawing.Size(705, 441);
    117120      this.operatorGraphTabPage.TabIndex = 2;
    118121      this.operatorGraphTabPage.Text = "Operator Graph";
     
    160163      this.operatorGraphViewHost.Location = new System.Drawing.Point(3, 33);
    161164      this.operatorGraphViewHost.Name = "operatorGraphViewHost";
    162       this.operatorGraphViewHost.Size = new System.Drawing.Size(699, 338);
     165      this.operatorGraphViewHost.Size = new System.Drawing.Size(699, 405);
    163166      this.operatorGraphViewHost.TabIndex = 0;
    164167      this.operatorGraphViewHost.ViewType = null;
     
    169172      this.globalScopeTabPage.Location = new System.Drawing.Point(4, 22);
    170173      this.globalScopeTabPage.Name = "globalScopeTabPage";
    171       this.globalScopeTabPage.Size = new System.Drawing.Size(705, 374);
     174      this.globalScopeTabPage.Size = new System.Drawing.Size(705, 441);
    172175      this.globalScopeTabPage.TabIndex = 3;
    173176      this.globalScopeTabPage.Text = "Global Scope";
     
    183186      this.globalScopeView.Location = new System.Drawing.Point(3, 3);
    184187      this.globalScopeView.Name = "globalScopeView";
    185       this.globalScopeView.Size = new System.Drawing.Size(699, 368);
     188      this.globalScopeView.Size = new System.Drawing.Size(699, 435);
    186189      this.globalScopeView.TabIndex = 0;
    187190      //
  • trunk/sources/HeuristicLab.Parameters/3.3/OptionalValueParameter.cs

    r2932 r2947  
    2727namespace HeuristicLab.Parameters {
    2828  /// <summary>
    29   /// A parameter whose value is defined it the parameter itself or is null.
     29  /// A parameter whose value is defined in the parameter itself or is null.
    3030  /// </summary>
    31   [Item("OptionalValueParameter<T>", "A parameter whose value is defined it the parameter itself or is null.")]
     31  [Item("OptionalValueParameter<T>", "A parameter whose value is defined in the parameter itself or is null.")]
    3232  public class OptionalValueParameter<T> : Parameter, IValueParameter<T> where T : class, IItem {
    3333    private T value;
  • trunk/sources/HeuristicLab.Parameters/3.3/ValueLookupParameter.cs

    r2932 r2947  
    2727namespace HeuristicLab.Parameters {
    2828  /// <summary>
    29   /// A parameter whose value is either defined it the parameter itself or is retrieved from the scope.
     29  /// A parameter whose value is either defined in the parameter itself or is retrieved from the scope.
    3030  /// </summary>
    31   [Item("ValueLookupParameter<T>", "A parameter whose value is either defined it the parameter itself or is retrieved from or written to a scope.")]
     31  [Item("ValueLookupParameter<T>", "A parameter whose value is either defined in the parameter itself or is retrieved from or written to a scope.")]
    3232  public class ValueLookupParameter<T> : LookupParameter<T>, IValueLookupParameter<T> where T : class, IItem {
    3333    private T value;
  • trunk/sources/HeuristicLab.Parameters/3.3/ValueParameter.cs

    r2931 r2947  
    2727namespace HeuristicLab.Parameters {
    2828  /// <summary>
    29   /// A parameter whose value is defined it the parameter itself.
     29  /// A parameter whose value is defined in the parameter itself.
    3030  /// </summary>
    31   [Item("ValueParameter<T>", "A parameter whose value is defined it the parameter itself.")]
     31  [Item("ValueParameter<T>", "A parameter whose value is defined in the parameter itself.")]
    3232  [EmptyStorableClass]
    3333  public class ValueParameter<T> : OptionalValueParameter<T> where T : class, IItem {
Note: See TracChangeset for help on using the changeset viewer.