Changeset 2924 for trunk

Timestamp:

03/04/10 04:52:28 (15 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• implemented reviewers' comments on version r2917.

Location:

trunk/sources

Files:

• HeuristicLab 3.3.sln (modified) (1 diff)
• HeuristicLab.Algorithms.SGA/3.3/SGA.cs (modified) (2 diffs)
• HeuristicLab.Algorithms.SGA/3.3/SGAOperator.cs (modified) (4 diffs)
• HeuristicLab.Analysis/3.3/BestAverageWorstQualityCalculator.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/CreateParameterDialog.Designer.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/ItemArrayView.Designer.cs (modified) (2 diffs)
• HeuristicLab.Core.Views/3.3/ItemCollectionView.Designer.cs (modified) (2 diffs)
• HeuristicLab.Core.Views/3.3/ItemCollectionView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/ItemListView.Designer.cs (modified) (2 diffs)
• HeuristicLab.Core.Views/3.3/OperatorCollectionView.cs (modified) (2 diffs)
• HeuristicLab.Core.Views/3.3/OperatorGraphView.Designer.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/OperatorListView.cs (modified) (2 diffs)
• HeuristicLab.Core.Views/3.3/OperatorSetView.cs (modified) (2 diffs)
• HeuristicLab.Core.Views/3.3/OperatorsSidebar.Designer.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/ParameterCollectionView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/ScopeListView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/ScopeView.Designer.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/TypeSelector.Designer.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/TypeSelectorDialog.Designer.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/TypeSelectorDialog.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/ValueParameterCollectionView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/VariableCollectionView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/VariableView.Designer.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/EngineAlgorithm.cs (modified) (5 diffs)
• HeuristicLab.Parameters.Views/3.3/ConstrainedValueParameterView.Designer.cs (modified) (2 diffs)
• HeuristicLab.Parameters.Views/3.3/ConstrainedValueParameterView.cs (modified) (7 diffs)
• HeuristicLab.Parameters.Views/3.3/HeuristicLab.Parameters.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Parameters.Views/3.3/OptionalConstrainedValueParameterView.Designer.cs (added)
• HeuristicLab.Parameters.Views/3.3/OptionalConstrainedValueParameterView.cs (added)
• HeuristicLab.Parameters.Views/3.3/OptionalValueParameterView.Designer.cs (modified) (1 diff)
• HeuristicLab.Parameters.Views/3.3/ValueLookupParameterView.Designer.cs (modified) (1 diff)
• HeuristicLab.Parameters.Views/3.3/ValueParameterView.Designer.cs (modified) (1 diff)
• HeuristicLab.Parameters/3.3/ConstrainedValueParameter.cs (modified) (2 diffs)
• HeuristicLab.Parameters/3.3/HeuristicLab.Parameters-3.3.csproj (modified) (1 diff)
• HeuristicLab.Parameters/3.3/OptionalConstrainedValueParameter.cs (added)
• HeuristicLab.Parameters/3.3/OptionalValueParameter.cs (modified) (1 diff)
• HeuristicLab.Parameters/3.3/ValueParameter.cs (modified) (1 diff)
• HeuristicLab.Random/3.3/RandomCreator.cs (modified) (1 diff)
• HeuristicLab.SequentialEngine/3.3/SequentialEngine.cs (modified) (1 diff)

trunk/sources/HeuristicLab 3.3.sln

@@ -59 +59 @@
     {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB} = {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}
     {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1} = {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}
+    {446C4F3D-1A12-465A-9128-97D0F47140C9} = {446C4F3D-1A12-465A-9128-97D0F47140C9}
     {678E2145-8152-4E19-9646-07D439D00301} = {678E2145-8152-4E19-9646-07D439D00301}
     {BB994448-2B21-4564-BB2E-38D8FFF8CF18} = {BB994448-2B21-4564-BB2E-38D8FFF8CF18}

trunk/sources/HeuristicLab.Algorithms.SGA/3.3/SGA.cs

@@ -52 +52 @@
       get { return (ConstrainedValueParameter<ICrossover>)Parameters["Crossover"]; }
     }
-    private ConstrainedValueParameter<IManipulator> MutatorParameter {
-      get { return (ConstrainedValueParameter<IManipulator>)Parameters["Mutator"]; }
+    private OptionalConstrainedValueParameter<IManipulator> MutatorParameter {
+      get { return (OptionalConstrainedValueParameter<IManipulator>)Parameters["Mutator"]; }
     }
     private ValueParameter<IntData> ElitesParameter {
@@ -75 +75 @@
       Parameters.Add(new ConstrainedValueParameter<ICrossover>("Crossover", "The operator used to cross solutions."));
       Parameters.Add(new ValueParameter<DoubleData>("MutationProbability", "The probability that the mutation operator is applied on a solution.", new DoubleData(0.05)));
-      Parameters.Add(new ConstrainedValueParameter<IManipulator>("Mutator", "The operator used to mutate solutions."));
+      Parameters.Add(new OptionalConstrainedValueParameter<IManipulator>("Mutator", "The operator used to mutate solutions."));
       Parameters.Add(new ValueParameter<IntData>("Elites", "The numer of elite solutions which are kept in each generation.", new IntData(1)));
       Parameters.Add(new ValueParameter<IntData>("MaximumGenerations", "The maximum number of generations which should be processed.", new IntData(1000)));

trunk/sources/HeuristicLab.Algorithms.SGA/3.3/SGAOperator.cs

@@ -97 +97 @@
       #region Create operator graph
       VariableCreator variableCreator = new VariableCreator();
-      ResultsCollector resultsCollector1 = new ResultsCollector();
+      ResultsCollector resultsCollector = new ResultsCollector();
       SubScopesSorter subScopesSorter1 = new SubScopesSorter();
       Placeholder selector = new Placeholder();
@@ -116 +116 @@
       Comparator comparator = new Comparator();
       BestAverageWorstQualityCalculator bestAverageWorstQualityCalculator = new BestAverageWorstQualityCalculator();
-      ResultsCollector resultsCollector2 = new ResultsCollector();
       DataTableValuesCollector dataTableValuesCollector = new DataTableValuesCollector();
       ConditionalBranch conditionalBranch = new ConditionalBranch();
@@ -122 +121 @@
       OperatorGraph.InitialOperator = variableCreator;
 
+      variableCreator.CollectedValues.Add(new ValueParameter<IntData>("Generations", new IntData(0)));
+      variableCreator.CollectedValues.Add(new ValueParameter<DoubleData>("Best Quality", new DoubleData(0)));
+      variableCreator.CollectedValues.Add(new ValueParameter<DoubleData>("Average Quality", new DoubleData(0)));
+      variableCreator.CollectedValues.Add(new ValueParameter<DoubleData>("Worst Quality", new DoubleData(0)));
       variableCreator.CollectedValues.Add(new ValueParameter<DataTable>("Qualities", new DataTable("Qualities")));
-      variableCreator.Successor = resultsCollector1;
-
-      LookupParameter<DataTable> qualities = new LookupParameter<DataTable>("Qualities");
-      qualities.ActualName = "Qualities";
-      resultsCollector1.CollectedValues.Add(qualities);
-      resultsCollector1.ResultsParameter.ActualName = "Results";
-      resultsCollector1.Successor = subScopesSorter1;
+      variableCreator.Successor = resultsCollector;
+
+      resultsCollector.CollectedValues.Add(new LookupParameter<IntData>("Generations"));
+      resultsCollector.CollectedValues.Add(new LookupParameter<DoubleData>("Best Quality"));
+      resultsCollector.CollectedValues.Add(new LookupParameter<DoubleData>("Average Quality"));
+      resultsCollector.CollectedValues.Add(new LookupParameter<DoubleData>("Worst Quality"));
+      resultsCollector.CollectedValues.Add(new LookupParameter<DataTable>("Qualities"));
+      resultsCollector.ResultsParameter.ActualName = "Results";
+      resultsCollector.Successor = subScopesSorter1;
 
       subScopesSorter1.DescendingParameter.ActualName = "Maximization";
@@ -196 +201 @@
       comparator.Successor = bestAverageWorstQualityCalculator;
 
-      bestAverageWorstQualityCalculator.AverageQualityParameter.ActualName = "AverageQuality";
-      bestAverageWorstQualityCalculator.BestQualityParameter.ActualName = "BestQuality";
+      bestAverageWorstQualityCalculator.AverageQualityParameter.ActualName = "Average Quality";
+      bestAverageWorstQualityCalculator.BestQualityParameter.ActualName = "Best Quality";
       bestAverageWorstQualityCalculator.MaximizationParameter.ActualName = "Maximization";
       bestAverageWorstQualityCalculator.QualityParameter.ActualName = "Quality";
-      bestAverageWorstQualityCalculator.WorstQualityParameter.ActualName = "WorstQuality";
+      bestAverageWorstQualityCalculator.WorstQualityParameter.ActualName = "Worst Quality";
       bestAverageWorstQualityCalculator.Successor = dataTableValuesCollector;
 
-      LookupParameter<DoubleData> bestQuality = new LookupParameter<DoubleData>("BestQuality");
-      bestQuality.ActualName = "BestQuality";
-      dataTableValuesCollector.CollectedValues.Add(bestQuality);
-      LookupParameter<DoubleData> averageQuality = new LookupParameter<DoubleData>("AverageQuality");
-      averageQuality.ActualName = "AverageQuality";
-      dataTableValuesCollector.CollectedValues.Add(averageQuality);
-      LookupParameter<DoubleData> worstQuality = new LookupParameter<DoubleData>("WorstQuality");
-      worstQuality.ActualName = "WorstQuality";
-      dataTableValuesCollector.CollectedValues.Add(worstQuality);
+      dataTableValuesCollector.CollectedValues.Add(new LookupParameter<DoubleData>("Best Quality"));
+      dataTableValuesCollector.CollectedValues.Add(new LookupParameter<DoubleData>("Average Quality"));
+      dataTableValuesCollector.CollectedValues.Add(new LookupParameter<DoubleData>("Worst Quality"));
       dataTableValuesCollector.DataTableParameter.ActualName = "Qualities";
-      dataTableValuesCollector.Successor = resultsCollector2;
-
-      bestQuality = new LookupParameter<DoubleData>("BestQuality");
-      bestQuality.ActualName = "BestQuality";
-      resultsCollector2.CollectedValues.Add(bestQuality);
-      averageQuality = new LookupParameter<DoubleData>("AverageQuality");
-      averageQuality.ActualName = "AverageQuality";
-      resultsCollector2.CollectedValues.Add(averageQuality);
-      worstQuality = new LookupParameter<DoubleData>("WorstQuality");
-      worstQuality.ActualName = "WorstQuality";
-      resultsCollector2.CollectedValues.Add(worstQuality);
-      resultsCollector2.ResultsParameter.ActualName = "Results";
-      resultsCollector2.Successor = conditionalBranch;
+      dataTableValuesCollector.Successor = conditionalBranch;
 
       conditionalBranch.ConditionParameter.ActualName = "Terminate";

trunk/sources/HeuristicLab.Analysis/3.3/BestAverageWorstQualityCalculator.cs

@@ -76 +76 @@
           max = temp;
         }
-        BestQualityParameter.ActualValue = new DoubleData(max);
-        AverageQualityParameter.ActualValue = new DoubleData(sum / qualities.Length);
-        WorstQualityParameter.ActualValue = new DoubleData(min);
+
+        DoubleData best = BestQualityParameter.ActualValue;
+        if (best == null) BestQualityParameter.ActualValue = new DoubleData(max);
+        else best.Value = max;
+        DoubleData average = AverageQualityParameter.ActualValue;
+        if (average == null) AverageQualityParameter.ActualValue = new DoubleData(sum / qualities.Length);
+        else average.Value = sum / qualities.Length;
+        DoubleData worst = WorstQualityParameter.ActualValue;
+        if (worst == null) WorstQualityParameter.ActualValue = new DoubleData(min);
+        else worst.Value = min;
       }
       return base.Apply();

trunk/sources/HeuristicLab.Core.Views/3.3/CreateParameterDialog.Designer.cs

@@ -162 +162 @@
                   | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
-      this.parameterTypeSelector.Caption = "Available &Parameters";
+      this.parameterTypeSelector.Caption = "Available Parameters";
       this.parameterTypeSelector.Location = new System.Drawing.Point(12, 12);
       this.parameterTypeSelector.Name = "parameterTypeSelector";

trunk/sources/HeuristicLab.Core.Views/3.3/ItemArrayView.Designer.cs

@@ -158 +158 @@
       this.detailsGroupBox.TabIndex = 0;
       this.detailsGroupBox.TabStop = false;
-      this.detailsGroupBox.Text = "&Details";
+      this.detailsGroupBox.Text = "Details";
       // 
       // viewHost
@@ -180 +180 @@
       this.itemsGroupBox.TabIndex = 0;
       this.itemsGroupBox.TabStop = false;
-      this.itemsGroupBox.Text = "&Items";
+      this.itemsGroupBox.Text = "Items";
       // 
       // ItemArrayView

trunk/sources/HeuristicLab.Core.Views/3.3/ItemCollectionView.Designer.cs

@@ -185 +185 @@
       this.detailsGroupBox.TabIndex = 0;
       this.detailsGroupBox.TabStop = false;
-      this.detailsGroupBox.Text = "&Details";
+      this.detailsGroupBox.Text = "Details";
       // 
       // viewHost
@@ -207 +207 @@
       this.itemsGroupBox.TabIndex = 0;
       this.itemsGroupBox.TabStop = false;
-      this.itemsGroupBox.Text = "&Items";
+      this.itemsGroupBox.Text = "Items";
       // 
       // ItemCollectionView

trunk/sources/HeuristicLab.Core.Views/3.3/ItemCollectionView.cs

@@ -122 +122 @@
       if (!listViewItem.Text.Equals(listViewItem.Tag.ToString())) {
         listViewItem.Text = listViewItem.Tag.ToString();
-        itemsListView.Sort();
       }
     }

trunk/sources/HeuristicLab.Core.Views/3.3/ItemListView.Designer.cs

@@ -183 +183 @@
       this.detailsGroupBox.TabIndex = 0;
       this.detailsGroupBox.TabStop = false;
-      this.detailsGroupBox.Text = "&Details";
+      this.detailsGroupBox.Text = "Details";
       // 
       // viewHost
@@ -205 +205 @@
       this.itemsGroupBox.TabIndex = 0;
       this.itemsGroupBox.TabStop = false;
-      this.itemsGroupBox.Text = "&Items";
+      this.itemsGroupBox.Text = "Items";
       // 
       // ItemListView

trunk/sources/HeuristicLab.Core.Views/3.3/OperatorCollectionView.cs

@@ -16 +16 @@
       InitializeComponent();
       Caption = "Operator Collection";
-      itemsGroupBox.Text = "&Operators";
+      itemsGroupBox.Text = "Operators";
     }
     /// <summary>
@@ -32 +32 @@
       if (typeSelectorDialog == null) {
         typeSelectorDialog = new TypeSelectorDialog();
-        typeSelectorDialog.TypeSelector.Caption = "&Available Operators";
+        typeSelectorDialog.TypeSelector.Caption = "Available Operators";
         typeSelectorDialog.TypeSelector.Configure(typeof(IOperator), false, false);
       }

trunk/sources/HeuristicLab.Core.Views/3.3/OperatorGraphView.Designer.cs

@@ -118 +118 @@
       this.graphGroupBox.TabIndex = 0;
       this.graphGroupBox.TabStop = false;
-      this.graphGroupBox.Text = "Operator &Graph";
+      this.graphGroupBox.Text = "Operator Graph";
       // 
       // viewHost

trunk/sources/HeuristicLab.Core.Views/3.3/OperatorListView.cs

@@ -16 +16 @@
       InitializeComponent();
       Caption = "Operator List";
-      itemsGroupBox.Text = "&Operators";
+      itemsGroupBox.Text = "Operators";
     }
     /// <summary>
@@ -32 +32 @@
       if (typeSelectorDialog == null) {
         typeSelectorDialog = new TypeSelectorDialog();
-        typeSelectorDialog.TypeSelector.Caption = "&Available Operators";
+        typeSelectorDialog.TypeSelector.Caption = "Available Operators";
         typeSelectorDialog.TypeSelector.Configure(typeof(IOperator), false, false);
       }

trunk/sources/HeuristicLab.Core.Views/3.3/OperatorSetView.cs

@@ -16 +16 @@
       InitializeComponent();
       Caption = "Operator Set";
-      itemsGroupBox.Text = "&Operators";
+      itemsGroupBox.Text = "Operators";
     }
     /// <summary>
@@ -32 +32 @@
       if (typeSelectorDialog == null) {
         typeSelectorDialog = new TypeSelectorDialog();
-        typeSelectorDialog.TypeSelector.Caption = "&Available Operators";
+        typeSelectorDialog.TypeSelector.Caption = "Available Operators";
         typeSelectorDialog.TypeSelector.Configure(typeof(IOperator), false, false);
       }

trunk/sources/HeuristicLab.Core.Views/3.3/OperatorsSidebar.Designer.cs

@@ -50 +50 @@
       // typeSelector
       // 
-      this.typeSelector.Caption = "&Available Operators";
+      this.typeSelector.Caption = "Available Operators";
       this.typeSelector.Dock = System.Windows.Forms.DockStyle.Fill;
       this.typeSelector.Location = new System.Drawing.Point(0, 0);

trunk/sources/HeuristicLab.Core.Views/3.3/ParameterCollectionView.cs

@@ -37 +37 @@
       InitializeComponent();
       Caption = "ParameterCollection";
-      itemsGroupBox.Text = "&Parameters";
+      itemsGroupBox.Text = "Parameters";
     }
     /// <summary>

trunk/sources/HeuristicLab.Core.Views/3.3/ScopeListView.cs

@@ -13 +13 @@
       InitializeComponent();
       Caption = "ScopeList";
-      itemsGroupBox.Text = "&Scopes";
+      itemsGroupBox.Text = "Scopes";
     }
     /// <summary>

trunk/sources/HeuristicLab.Core.Views/3.3/ScopeView.Designer.cs

@@ -104 +104 @@
       this.scopesGroupBox.TabIndex = 0;
       this.scopesGroupBox.TabStop = false;
-      this.scopesGroupBox.Text = "&Scopes";
+      this.scopesGroupBox.Text = "Scopes";
       // 
       // variableCollectionView

trunk/sources/HeuristicLab.Core.Views/3.3/TypeSelector.Designer.cs

@@ -89 +89 @@
       this.typesGroupBox.TabIndex = 0;
       this.typesGroupBox.TabStop = false;
-      this.typesGroupBox.Text = "&Available Types";
+      this.typesGroupBox.Text = "Available Types";
       // 
       // splitContainer

trunk/sources/HeuristicLab.Core.Views/3.3/TypeSelectorDialog.Designer.cs

@@ -75 +75 @@
                   | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
-      this.typeSelector.Caption = "&Available Types";
+      this.typeSelector.Caption = "Available Types";
       this.typeSelector.Location = new System.Drawing.Point(12, 12);
       this.typeSelector.Name = "typeSelector";

trunk/sources/HeuristicLab.Core.Views/3.3/TypeSelectorDialog.cs

@@ -51 +51 @@
     public TypeSelectorDialog() {
       InitializeComponent();
+      okButton.Enabled = typeSelector.SelectedType != null;
     }
 

trunk/sources/HeuristicLab.Core.Views/3.3/ValueParameterCollectionView.cs

@@ -37 +37 @@
       InitializeComponent();
       Caption = "ValueParameterCollection";
-      itemsGroupBox.Text = "&Parameters";
+      itemsGroupBox.Text = "Parameters";
     }
     /// <summary>

trunk/sources/HeuristicLab.Core.Views/3.3/VariableCollectionView.cs

@@ -13 +13 @@
       InitializeComponent();
       Caption = "VariableCollection";
-      itemsGroupBox.Text = "&Variables";
+      itemsGroupBox.Text = "Variables";
     }
     /// <summary>

trunk/sources/HeuristicLab.Core.Views/3.3/VariableView.Designer.cs

@@ -100 +100 @@
       this.valueGroupBox.TabIndex = 7;
       this.valueGroupBox.TabStop = false;
-      this.valueGroupBox.Text = "&Value:";
+      this.valueGroupBox.Text = "Value";
       // 
       // valuePanel

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

@@ -96 +96 @@
     protected EngineAlgorithm()
       : base() {
-      globalScope = new Scope();
+      globalScope = new Scope("Global Scope");
       globalScope.Variables.Add(new Variable("Results", new VariableCollection()));
       OperatorGraph = new OperatorGraph();
@@ -103 +103 @@
     protected EngineAlgorithm(string name)
       : base(name) {
-      globalScope = new Scope();
+      globalScope = new Scope("Global Scope");
       globalScope.Variables.Add(new Variable("Results", new VariableCollection()));
       OperatorGraph = new OperatorGraph();
@@ -110 +110 @@
     protected EngineAlgorithm(string name, ParameterCollection parameters)
       : base(name, parameters) {
-      globalScope = new Scope();
+      globalScope = new Scope("Global Scope");
       globalScope.Variables.Add(new Variable("Results", new VariableCollection()));
       OperatorGraph = new OperatorGraph();
@@ -117 +117 @@
     protected EngineAlgorithm(string name, string description)
       : base(name, description) {
-      globalScope = new Scope();
+      globalScope = new Scope("Global Scope");
       globalScope.Variables.Add(new Variable("Results", new VariableCollection()));
       OperatorGraph = new OperatorGraph();
@@ -124 +124 @@
     protected EngineAlgorithm(string name, string description, ParameterCollection parameters)
       : base(name, description, parameters) {
-      globalScope = new Scope();
+      globalScope = new Scope("Global Scope");
       globalScope.Variables.Add(new Variable("Results", new VariableCollection()));
       OperatorGraph = new OperatorGraph();

trunk/sources/HeuristicLab.Parameters.Views/3.3/ConstrainedValueParameterView.Designer.cs

@@ -85 +85 @@
       this.valueGroupBox.TabIndex = 6;
       this.valueGroupBox.TabStop = false;
-      this.valueGroupBox.Text = "&Value:";
+      this.valueGroupBox.Text = "Value";
       // 
       // viewHost
@@ -135 +135 @@
     #endregion
 
-    private System.Windows.Forms.GroupBox valueGroupBox;
-    private HeuristicLab.Core.Views.ViewHost viewHost;
-    private System.Windows.Forms.ComboBox valueComboBox;
+    protected System.Windows.Forms.GroupBox valueGroupBox;
+    protected HeuristicLab.Core.Views.ViewHost viewHost;
+    protected System.Windows.Forms.ComboBox valueComboBox;
   }
 }

trunk/sources/HeuristicLab.Parameters.Views/3.3/ConstrainedValueParameterView.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Collections;
 using HeuristicLab.Core;
@@ -33 +33 @@
   [View("ConstrainedValueParameter View")]
   [Content(typeof(ConstrainedValueParameter<>), true)]
-  public sealed partial class ConstrainedValueParameterView<T> : ParameterView where T : class, IItem {
-    private List<T> valueComboBoxItems;
-
+  public partial class ConstrainedValueParameterView<T> : ParameterView where T : class, IItem {
     /// <summary>
     /// Gets or sets the variable to represent visually.
@@ -52 +50 @@
       InitializeComponent();
       Caption = "ConstrainedValueParameter";
-      valueComboBoxItems = new List<T>();
     }
     /// <summary>
@@ -104 +101 @@
 
     private void FillValueComboBox() {
-      valueComboBoxItems.Clear();
-      valueComboBoxItems.Add(null);
+      valueComboBox.SelectedIndexChanged -= new EventHandler(valueComboBox_SelectedIndexChanged);
+      valueComboBox.DataSource = null;
       if (Content != null) {
-        foreach (T item in Content.ValidValues)
-          valueComboBoxItems.Add(item);
+        valueComboBox.DataSource = Content.ValidValues.ToList();
+        valueComboBox.Enabled = valueComboBox.Items.Count > 0;
+        valueComboBox.SelectedItem = Content.Value;
       }
-      valueComboBox.Items.Clear();
-      foreach (T item in valueComboBoxItems)
-        valueComboBox.Items.Add(item == null ? "-" : item.ToString());
-      if (Content != null) valueComboBox.SelectedIndex = valueComboBoxItems.IndexOf(Content.Value);
+      valueComboBox.SelectedIndexChanged += new EventHandler(valueComboBox_SelectedIndexChanged);
     }
 
@@ -121 +116 @@
         Invoke(new EventHandler(Content_ValueChanged), sender, e);
       else {
-        valueComboBox.SelectedIndex = valueComboBoxItems.IndexOf(Content.Value);
+        valueComboBox.SelectedItem = Content.Value;
         viewHost.Content = Content.Value;
       }
@@ -128 +123 @@
       if (InvokeRequired)
         Invoke(new CollectionItemsChangedEventHandler<T>(ValidValues_ItemsAdded), sender, e);
-      else {
-        foreach (T item in e.Items) {
-          valueComboBoxItems.Add(item);
-          valueComboBox.Items.Add(item == null ? "-" : item.ToString());
-        }
-      }
+      else
+        FillValueComboBox();
     }
     private void ValidValues_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<T> e) {
       if (InvokeRequired)
         Invoke(new CollectionItemsChangedEventHandler<T>(ValidValues_ItemsRemoved), sender, e);
-      else {
-        foreach (T item in e.Items) {
-          int index = valueComboBoxItems.IndexOf(item);
-          valueComboBoxItems.RemoveAt(index);
-          valueComboBox.Items.RemoveAt(index);
-        }
-      }
+      else
+        FillValueComboBox();
     }
     private void ValidValues_CollectionReset(object sender, CollectionItemsChangedEventArgs<T> e) {
@@ -155 +141 @@
 
     private void valueComboBox_SelectedIndexChanged(object sender, EventArgs e) {
-      Content.Value = valueComboBoxItems[valueComboBox.SelectedIndex];
+      Content.Value = (T)valueComboBox.SelectedItem;
     }
   }

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

@@ -91 +91 @@
     <Compile Include="ConstrainedValueParameterView.Designer.cs">
       <DependentUpon>ConstrainedValueParameterView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="OptionalConstrainedValueParameterView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="OptionalConstrainedValueParameterView.Designer.cs">
+      <DependentUpon>OptionalConstrainedValueParameterView.cs</DependentUpon>
     </Compile>
     <Compile Include="OptionalValueParameterView.cs">

trunk/sources/HeuristicLab.Parameters.Views/3.3/OptionalValueParameterView.Designer.cs

@@ -90 +90 @@
       this.valueGroupBox.TabIndex = 6;
       this.valueGroupBox.TabStop = false;
-      this.valueGroupBox.Text = "&Value:";
+      this.valueGroupBox.Text = "Value";
       // 
       // valuePanel

trunk/sources/HeuristicLab.Parameters.Views/3.3/ValueLookupParameterView.Designer.cs

@@ -100 +100 @@
       this.valueGroupBox.TabIndex = 8;
       this.valueGroupBox.TabStop = false;
-      this.valueGroupBox.Text = "&Value:";
+      this.valueGroupBox.Text = "Value";
       // 
       // valuePanel

trunk/sources/HeuristicLab.Parameters.Views/3.3/ValueParameterView.Designer.cs

@@ -85 +85 @@
       this.valueGroupBox.TabIndex = 6;
       this.valueGroupBox.TabStop = false;
-      this.valueGroupBox.Text = "&Value:";
+      this.valueGroupBox.Text = "Value";
       // 
       // valuePanel

trunk/sources/HeuristicLab.Parameters/3.3/ConstrainedValueParameter.cs

@@ -21 +21 @@
 
 using System;
-using HeuristicLab.Common;
+using System.Linq;
+using HeuristicLab.Collections;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -27 +28 @@
 namespace HeuristicLab.Parameters {
   /// <summary>
-  /// A parameter whose value has to be chosen from a set of valid values which is defined it the parameter itself.
+  /// A parameter whose value has to be chosen from a set of valid values.
   /// </summary>
-  [Item("ConstrainedValueParameter<T>", "A parameter whose value has to be chosen from a set of valid values which is defined it the parameter itself.")]
-  public sealed class ConstrainedValueParameter<T> : Parameter, IValueParameter<T> where T : class, IItem {
-    private ItemSet<T> validValues;
-    [Storable]
-    public ItemSet<T> ValidValues {
-      get { return validValues; }
-      private set {
-        DeregisterValidValuesEvents();
-        validValues = value;
-        RegisterValidValuesEvents();
+  [Item("ConstrainedValueParameter<T>", "A parameter whose value has to be chosen from a set of valid values.")]
+  [EmptyStorableClass]
+  public class ConstrainedValueParameter<T> : OptionalConstrainedValueParameter<T> where T : class, IItem {
+    public override T Value {
+      get { return base.Value; }
+      set {
+        if ((value == null) && (ValidValues.Count > 0)) throw new ArgumentNullException();
+        base.Value = value;
       }
     }
 
-    private T value;
-    [Storable]
-    public T Value {
-      get { return this.value; }
-      set {
-        if (value != this.value) {
-          if ((value != null) && !validValues.Contains(value)) throw new ArgumentException("Invalid value.");
-          this.value = value;
-          OnValueChanged();
-        }
-      }
+    public ConstrainedValueParameter() : base() { }
+    public ConstrainedValueParameter(string name) : base(name) { }
+    public ConstrainedValueParameter(string name, ItemSet<T> validValues) : base(name, validValues) { }
+    public ConstrainedValueParameter(string name, ItemSet<T> validValues, T value) : base(name, validValues, value) { }
+    public ConstrainedValueParameter(string name, string description) : base(name, description) { }
+    public ConstrainedValueParameter(string name, string description, ItemSet<T> validValues) : base(name, description, validValues) { }
+    public ConstrainedValueParameter(string name, string description, ItemSet<T> validValues, T value) : base(name, description, validValues, value) { }
+
+    protected override void validValues_ItemsAdded(object sender, CollectionItemsChangedEventArgs<T> e) {
+      if (Value == null) Value = ValidValues.First();
     }
-    IItem IValueParameter.Value {
-      get { return Value; }
-      set {
-        T val = value as T;
-        if ((value != null) && (val == null))
-          throw new InvalidOperationException(
-            string.Format("Type mismatch. Value is not a \"{0}\".",
-                          typeof(T).GetPrettyName())
-          );
-        Value = val;
-      }
+    protected override void ValidValues_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<T> e) {
+      if ((Value != null) && !ValidValues.Contains(Value)) Value = ValidValues.FirstOrDefault();
     }
-
-    public ConstrainedValueParameter()
-      : base("Anonymous", typeof(T)) {
-      ValidValues = new ItemSet<T>();
-    }
-    public ConstrainedValueParameter(string name)
-      : base(name, typeof(T)) {
-      ValidValues = new ItemSet<T>();
-    }
-    public ConstrainedValueParameter(string name, ItemSet<T> validValues)
-      : base(name, typeof(T)) {
-      ValidValues = validValues;
-    }
-    public ConstrainedValueParameter(string name, ItemSet<T> validValues, T value)
-      : base(name, typeof(T)) {
-      ValidValues = validValues;
-      Value = value;
-    }
-    public ConstrainedValueParameter(string name, string description)
-      : base(name, description, typeof(T)) {
-      ValidValues = new ItemSet<T>();
-    }
-    public ConstrainedValueParameter(string name, string description, ItemSet<T> validValues)
-      : base(name, description, typeof(T)) {
-      ValidValues = validValues;
-    }
-    public ConstrainedValueParameter(string name, string description, ItemSet<T> validValues, T value)
-      : base(name, description, typeof(T)) {
-      ValidValues = validValues;
-      Value = value;
-    }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      ConstrainedValueParameter<T> clone = (ConstrainedValueParameter<T>)base.Clone(cloner);
-      clone.ValidValues = (ItemSet<T>)cloner.Clone(validValues);
-      clone.Value = (T)cloner.Clone(value);
-      return clone;
-    }
-
-    public override string ToString() {
-      return string.Format("{0}: {1} ({2})", Name, Value != null ? Value.ToString() : "null", DataType.GetPrettyName());
-    }
-
-    protected override IItem GetActualValue() {
-      return Value;
-    }
-    protected override void SetActualValue(IItem value) {
-      ((IValueParameter)this).Value = value;
-    }
-
-    public event EventHandler ValueChanged;
-    private void OnValueChanged() {
-      if (ValueChanged != null)
-        ValueChanged(this, EventArgs.Empty);
-      OnChanged();
-    }
-
-    private void RegisterValidValuesEvents() {
-      if (validValues != null) {
-        validValues.ItemsRemoved += new HeuristicLab.Collections.CollectionItemsChangedEventHandler<T>(ValidValues_ItemsRemoved);
-        validValues.CollectionReset += new HeuristicLab.Collections.CollectionItemsChangedEventHandler<T>(ValidValues_CollectionReset);
-        validValues.Changed += new ChangedEventHandler(ValidValues_Changed);
-      }
-    }
-    private void DeregisterValidValuesEvents() {
-      if (validValues != null) {
-        validValues.ItemsRemoved -= new HeuristicLab.Collections.CollectionItemsChangedEventHandler<T>(ValidValues_ItemsRemoved);
-        validValues.CollectionReset -= new HeuristicLab.Collections.CollectionItemsChangedEventHandler<T>(ValidValues_CollectionReset);
-        validValues.Changed -= new ChangedEventHandler(ValidValues_Changed);
-      }
-    }
-
-    private void ValidValues_ItemsRemoved(object sender, HeuristicLab.Collections.CollectionItemsChangedEventArgs<T> e) {
-      if ((Value != null) && !validValues.Contains(Value)) Value = null;
-    }
-    private void ValidValues_CollectionReset(object sender, HeuristicLab.Collections.CollectionItemsChangedEventArgs<T> e) {
-      if ((Value != null) && !validValues.Contains(Value)) Value = null;
-    }
-    private void ValidValues_Changed(object sender, ChangedEventArgs e) {
-      OnChanged(e);
+    protected override void ValidValues_CollectionReset(object sender, CollectionItemsChangedEventArgs<T> e) {
+      if ((Value != null) && !ValidValues.Contains(Value)) Value = ValidValues.FirstOrDefault();
     }
   }

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

@@ -85 +85 @@
     <None Include="HeuristicLabParametersPlugin.cs.frame" />
     <Compile Include="ConstrainedValueParameter.cs" />
+    <Compile Include="OptionalConstrainedValueParameter.cs" />
     <Compile Include="ValueParameter.cs" />
     <Compile Include="LookupParameter.cs" />

trunk/sources/HeuristicLab.Parameters/3.3/OptionalValueParameter.cs

@@ -33 +33 @@
     private T value;
     [Storable]
-    public T Value {
+    public virtual T Value {
       get { return this.value; }
       set {

trunk/sources/HeuristicLab.Parameters/3.3/ValueParameter.cs

@@ -30 +30 @@
   /// </summary>
   [Item("ValueParameter<T>", "A parameter whose value is defined it the parameter itself.")]
-  public sealed class ValueParameter<T> : Parameter, IValueParameter<T> where T : class, IItem {
-    private T value;
-    [Storable]
-    public T Value {
-      get { return this.value; }
+  [EmptyStorableClass]
+  public class ValueParameter<T> : OptionalValueParameter<T> where T : class, IItem {
+    public override T Value {
+      get { return base.Value; }
       set {
         if (value == null) throw new ArgumentNullException();
-        if (value != this.value) {
-          if (this.value != null) this.value.Changed -= new ChangedEventHandler(Value_Changed);
-          this.value = value;
-          this.value.Changed += new ChangedEventHandler(Value_Changed);
-          OnValueChanged();
-        }
-      }
-    }
-    IItem IValueParameter.Value {
-      get { return Value; }
-      set {
-        if (value == null) throw new ArgumentNullException();
-        T val = value as T;
-        if (val == null)
-          throw new InvalidOperationException(
-            string.Format("Type mismatch. Value is not a \"{0}\".",
-                          typeof(T).GetPrettyName())
-          );
-        Value = val;
+        base.Value = value;
       }
     }
 
-    private ValueParameter()
-      : base("Anonymous", typeof(T)) {
-    }
-    public ValueParameter(string name, T value)
-      : base(name, typeof(T)) {
-      Value = value;
-    }
-    public ValueParameter(string name, string description, T value)
-      : base(name, description, typeof(T)) {
-      Value = value;
-    }
+    private ValueParameter() : base() { }
+    public ValueParameter(string name, T value) : base(name, value) { }
+    public ValueParameter(string name, string description, T value) : base(name, description, value) { }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      ValueParameter<T> clone = new ValueParameter<T>(name, description, value);
+      ValueParameter<T> clone = new ValueParameter<T>(name, description, Value);
       cloner.RegisterClonedObject(this, clone);
-      clone.Value = (T)cloner.Clone(value);
+      clone.Value = (T)cloner.Clone(Value);
       return clone;
-    }
-
-    public override string ToString() {
-      return string.Format("{0}: {1} ({2})", Name, Value.ToString(), DataType.GetPrettyName());
-    }
-
-    protected override IItem GetActualValue() {
-      return Value;
-    }
-    protected override void SetActualValue(IItem value) {
-      ((IValueParameter)this).Value = value;
-    }
-
-    public event EventHandler ValueChanged;
-    private void OnValueChanged() {
-      if (ValueChanged != null)
-        ValueChanged(this, EventArgs.Empty);
-      OnChanged();
-    }
-    private void Value_Changed(object sender, ChangedEventArgs e) {
-      OnChanged(e);
     }
   }

trunk/sources/HeuristicLab.Random/3.3/RandomCreator.cs

@@ -28 +28 @@
 namespace HeuristicLab.Operators {
   /// <summary>
-  /// An operator which creates a new pseudo random number generator.
+  /// An operator which creates a new Mersenne Twister pseudo random number generator.
   /// </summary>
-  [Item("RandomCreator", "An operator which creates a new pseudo random number generator.")]
+  [Item("RandomCreator", "An operator which creates a new Mersenne Twister pseudo random number generator.")]
   [EmptyStorableClass]
   [Creatable("Test")]

trunk/sources/HeuristicLab.SequentialEngine/3.3/SequentialEngine.cs

@@ -30 +30 @@
   /// </summary>
   [EmptyStorableClass]
-  [Creatable("Engines")]
   [Item("Sequential Engine", "Engine for sequential execution of algorithms.")]
   public class SequentialEngine : Engine {