Changeset 7985

Timestamp:

06/12/12 01:47:25 (12 years ago)

Author:

abeham

Message:

#1851: Allow to specify each value of numeric parameters explicitly as well as provide a dialog for generating the values

Location:

trunk/sources/HeuristicLab.Optimizer/3.3

Files:

• CreateExperimentDialog.Designer.cs (modified) (8 diffs)
• CreateExperimentDialog.cs (modified) (16 diffs)
• DefineArithmeticProgressionDialog.Designer.cs (added)
• DefineArithmeticProgressionDialog.cs (added)
• HeuristicLab.Optimizer-3.3.csproj (modified) (2 diffs)
• Plugin.cs.frame (modified) (1 diff)

trunk/sources/HeuristicLab.Optimizer/3.3/CreateExperimentDialog.Designer.cs

@@ -65 +65 @@
       this.parametersListView = new System.Windows.Forms.ListView();
       this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+      this.generateButton = new System.Windows.Forms.Button();
+      this.stringConvertibleArrayView = new HeuristicLab.Data.Views.StringConvertibleArrayView();
       this.detailsTypeLabel = new System.Windows.Forms.Label();
-      this.stepSizeTextBox = new System.Windows.Forms.TextBox();
-      this.maximumTextBox = new System.Windows.Forms.TextBox();
-      this.minimumTextBox = new System.Windows.Forms.TextBox();
-      this.stepSizeLabel = new System.Windows.Forms.Label();
-      this.maximumLabel = new System.Windows.Forms.Label();
-      this.minimumLabel = new System.Windows.Forms.Label();
       this.choicesListView = new System.Windows.Forms.ListView();
       this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
@@ -80 +76 @@
       this.variationsLabel = new System.Windows.Forms.Label();
       this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components);
+      this.warningProvider = new System.Windows.Forms.ErrorProvider(this.components);
       this.experimentCreationProgressBar = new System.Windows.Forms.ProgressBar();
-      this.warningProvider = new System.Windows.Forms.ErrorProvider(this.components);
       ((System.ComponentModel.ISupportInitialize)(this.repetitionsNumericUpDown)).BeginInit();
       this.tabControl.SuspendLayout();
@@ -273 +269 @@
       // parametersSplitContainer.Panel2
       // 
+      this.parametersSplitContainer.Panel2.Controls.Add(this.generateButton);
+      this.parametersSplitContainer.Panel2.Controls.Add(this.stringConvertibleArrayView);
       this.parametersSplitContainer.Panel2.Controls.Add(this.detailsTypeLabel);
-      this.parametersSplitContainer.Panel2.Controls.Add(this.stepSizeTextBox);
-      this.parametersSplitContainer.Panel2.Controls.Add(this.maximumTextBox);
-      this.parametersSplitContainer.Panel2.Controls.Add(this.minimumTextBox);
-      this.parametersSplitContainer.Panel2.Controls.Add(this.stepSizeLabel);
-      this.parametersSplitContainer.Panel2.Controls.Add(this.maximumLabel);
-      this.parametersSplitContainer.Panel2.Controls.Add(this.minimumLabel);
       this.parametersSplitContainer.Panel2.Controls.Add(this.choicesListView);
       this.parametersSplitContainer.Size = new System.Drawing.Size(314, 267);
@@ -306 +298 @@
       this.columnHeader1.Width = 150;
       // 
+      // generateButton
+      // 
+      this.generateButton.Location = new System.Drawing.Point(16, 10);
+      this.generateButton.Name = "generateButton";
+      this.generateButton.Size = new System.Drawing.Size(75, 23);
+      this.generateButton.TabIndex = 8;
+      this.generateButton.Text = "Generate...";
+      this.generateButton.UseVisualStyleBackColor = true;
+      this.generateButton.Click += new System.EventHandler(this.generateButton_Click);
+      // 
+      // stringConvertibleArrayView
+      // 
+      this.stringConvertibleArrayView.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.stringConvertibleArrayView.Caption = "StringConvertibleArray View";
+      this.stringConvertibleArrayView.Content = null;
+      this.stringConvertibleArrayView.Location = new System.Drawing.Point(16, 39);
+      this.stringConvertibleArrayView.Name = "stringConvertibleArrayView";
+      this.stringConvertibleArrayView.ReadOnly = false;
+      this.stringConvertibleArrayView.Size = new System.Drawing.Size(155, 215);
+      this.stringConvertibleArrayView.TabIndex = 7;
+      // 
       // detailsTypeLabel
       // 
@@ -314 +329 @@
       this.detailsTypeLabel.TabIndex = 0;
       this.detailsTypeLabel.Text = "Choices:";
-      // 
-      // stepSizeTextBox
-      // 
-      this.stepSizeTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.stepSizeTextBox.Location = new System.Drawing.Point(73, 86);
-      this.stepSizeTextBox.Name = "stepSizeTextBox";
-      this.stepSizeTextBox.Size = new System.Drawing.Size(98, 20);
-      this.stepSizeTextBox.TabIndex = 5;
-      this.stepSizeTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.detailsTextBox_Validating);
-      // 
-      // maximumTextBox
-      // 
-      this.maximumTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.maximumTextBox.Location = new System.Drawing.Point(73, 60);
-      this.maximumTextBox.Name = "maximumTextBox";
-      this.maximumTextBox.Size = new System.Drawing.Size(98, 20);
-      this.maximumTextBox.TabIndex = 3;
-      this.maximumTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.detailsTextBox_Validating);
-      // 
-      // minimumTextBox
-      // 
-      this.minimumTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.minimumTextBox.Location = new System.Drawing.Point(73, 34);
-      this.minimumTextBox.Name = "minimumTextBox";
-      this.minimumTextBox.Size = new System.Drawing.Size(98, 20);
-      this.minimumTextBox.TabIndex = 1;
-      this.minimumTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.detailsTextBox_Validating);
-      // 
-      // stepSizeLabel
-      // 
-      this.stepSizeLabel.AutoSize = true;
-      this.stepSizeLabel.Location = new System.Drawing.Point(13, 89);
-      this.stepSizeLabel.Name = "stepSizeLabel";
-      this.stepSizeLabel.Size = new System.Drawing.Size(53, 13);
-      this.stepSizeLabel.TabIndex = 4;
-      this.stepSizeLabel.Text = "Step size:";
-      // 
-      // maximumLabel
-      // 
-      this.maximumLabel.AutoSize = true;
-      this.maximumLabel.Location = new System.Drawing.Point(13, 63);
-      this.maximumLabel.Name = "maximumLabel";
-      this.maximumLabel.Size = new System.Drawing.Size(54, 13);
-      this.maximumLabel.TabIndex = 2;
-      this.maximumLabel.Text = "Maximum:";
-      // 
-      // minimumLabel
-      // 
-      this.minimumLabel.AutoSize = true;
-      this.minimumLabel.Location = new System.Drawing.Point(13, 37);
-      this.minimumLabel.Name = "minimumLabel";
-      this.minimumLabel.Size = new System.Drawing.Size(51, 13);
-      this.minimumLabel.TabIndex = 0;
-      this.minimumLabel.Text = "Minimum:";
       // 
       // choicesListView
@@ -456 +414 @@
       this.errorProvider.ContainerControl = this;
       // 
+      // warningProvider
+      // 
+      this.warningProvider.BlinkStyle = System.Windows.Forms.ErrorBlinkStyle.NeverBlink;
+      this.warningProvider.ContainerControl = this;
+      this.warningProvider.Icon = ((System.Drawing.Icon)(resources.GetObject("warningProvider.Icon")));
+      // 
       // experimentCreationProgressBar
       // 
@@ -466 +430 @@
       this.experimentCreationProgressBar.Visible = false;
       // 
-      // warningProvider
-      // 
-      this.warningProvider.BlinkStyle = System.Windows.Forms.ErrorBlinkStyle.NeverBlink;
-      this.warningProvider.ContainerControl = this;
-      this.warningProvider.Icon = ((System.Drawing.Icon)(resources.GetObject("warningProvider.Icon")));
-      // 
       // CreateExperimentDialog
       // 
       this.AcceptButton = this.okButton;
-      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
       this.CancelButton = this.cancelButton;
@@ -542 +499 @@
     private System.Windows.Forms.ListView choicesListView;
     private System.Windows.Forms.ColumnHeader columnHeader2;
-    private System.Windows.Forms.TextBox stepSizeTextBox;
-    private System.Windows.Forms.TextBox maximumTextBox;
-    private System.Windows.Forms.TextBox minimumTextBox;
-    private System.Windows.Forms.Label stepSizeLabel;
-    private System.Windows.Forms.Label maximumLabel;
-    private System.Windows.Forms.Label minimumLabel;
     private System.Windows.Forms.Label label1;
     private System.Windows.Forms.ErrorProvider errorProvider;
-    private System.Windows.Forms.ProgressBar experimentCreationProgressBar;
     private System.Windows.Forms.ErrorProvider warningProvider;
     private System.Windows.Forms.TreeView instancesTreeView;
+    private Data.Views.StringConvertibleArrayView stringConvertibleArrayView;
+    private System.Windows.Forms.ProgressBar experimentCreationProgressBar;
+    private System.Windows.Forms.Button generateButton;
 
   }

trunk/sources/HeuristicLab.Optimizer/3.3/CreateExperimentDialog.cs

@@ -56 +56 @@
     private int repetitions;
     private Dictionary<IProblemInstanceProvider, HashSet<IDataDescriptor>> instances;
-    private Dictionary<IValueParameter, Tuple<int, int, int>> intParameters;
-    private Dictionary<IValueParameter, Tuple<double, double, double>> doubleParameters;
+    private Dictionary<IValueParameter, IntArray> intParameters;
+    private Dictionary<IValueParameter, DoubleArray> doubleParameters;
     private HashSet<IValueParameter> boolParameters;
     private Dictionary<IValueParameter, HashSet<IItem>> multipleChoiceParameters;
@@ -77 +77 @@
 
       instances = new Dictionary<IProblemInstanceProvider, HashSet<IDataDescriptor>>();
-      intParameters = new Dictionary<IValueParameter, Tuple<int, int, int>>();
-      doubleParameters = new Dictionary<IValueParameter, Tuple<double, double, double>>();
+      intParameters = new Dictionary<IValueParameter, IntArray>();
+      doubleParameters = new Dictionary<IValueParameter, DoubleArray>();
       boolParameters = new HashSet<IValueParameter>();
       multipleChoiceParameters = new Dictionary<IValueParameter, HashSet<IItem>>();
@@ -118 +118 @@
 
       if (isConstrainedValueParameter) {
-        if (e.Item.Checked) {
-          multipleChoiceParameters.Add(parameter, new HashSet<IItem>());
-        } else {
-          multipleChoiceParameters.Remove(parameter);
-        }
+        if (e.Item.Checked) multipleChoiceParameters.Add(parameter, new HashSet<IItem>());
+        else multipleChoiceParameters.Remove(parameter);
       }
 
@@ -128 +125 @@
       if (intValue != null) {
         if (e.Item.Checked) {
-          int minimum = intValue.Value;
-          int maximum = intValue.Value;
-          int step = 1;
-          intParameters.Add(parameter, new Tuple<int, int, int>(minimum, maximum, step));
+          intParameters.Add(parameter, new IntArray());
+          intParameters[parameter].Reset += new EventHandler(ValuesArray_Reset);
         } else intParameters.Remove(parameter);
       }
@@ -138 +133 @@
       if (doubleValue != null) {
         if (e.Item.Checked) {
-          double minimum = doubleValue.Value;
-          double maximum = doubleValue.Value;
-          double step = 1;
-          doubleParameters.Add(parameter, new Tuple<double, double, double>(minimum, maximum, step));
+          doubleParameters.Add(parameter, new DoubleArray());
+          doubleParameters[parameter].Reset += new EventHandler(ValuesArray_Reset);
         } else doubleParameters.Remove(parameter);
       }
@@ -174 +167 @@
       if (isConstrainedValueParameter) {
         detailsTypeLabel.Text = "Choices:";
-        choicesListView.Enabled = true;
-        choicesListView.Visible = true;
         choicesListView.Tag = parameter;
 
-        if (!multipleChoiceParameters.ContainsKey(parameter)) return;
         dynamic constrainedValuedParameter = parameter;
         dynamic validValues = constrainedValuedParameter.ValidValues;
@@ -184 +174 @@
           choicesListView.Items.Add(new ListViewItem(choice.ToString()) {
             Tag = choice,
-            Checked = multipleChoiceParameters[parameter].Contains(choice)
+            Checked = multipleChoiceParameters.ContainsKey(parameter)
+            && multipleChoiceParameters[parameter].Contains(choice)
           });
         }
+        choicesListView.Enabled = multipleChoiceParameters.ContainsKey(parameter);
+        detailsTypeLabel.Visible = true;
+        choicesListView.Visible = true;
         return;
       }
 
-      if (!(parameter.Value is ValueTypeValue<bool>)) {
-        minimumLabel.Visible = true; minimumTextBox.Visible = true;
-        maximumLabel.Visible = true; maximumTextBox.Visible = true;
-        stepSizeLabel.Visible = true; stepSizeTextBox.Visible = true;
-      } else detailsTypeLabel.Text = "Boolean parameter: True / False";
+      if (parameter.Value is ValueTypeValue<bool>) {
+        detailsTypeLabel.Text = "Boolean parameter: True / False";
+        detailsTypeLabel.Visible = true;
+      }
 
       var intValue = parameter.Value as ValueTypeValue<int>;
       if (intValue != null) {
-        detailsTypeLabel.Text = "Integer parameter:";
-        if (!intParameters.ContainsKey(parameter)) return;
-        string min = intParameters[parameter].Item1.ToString();
-        string max = intParameters[parameter].Item2.ToString();
-        string step = intParameters[parameter].Item3.ToString();
-        UpdateMinMaxStepSize(parameter, min, max, step);
+        if (intParameters.ContainsKey(parameter))
+          stringConvertibleArrayView.Content = intParameters[parameter];
+        stringConvertibleArrayView.Visible = true;
+        stringConvertibleArrayView.ReadOnly = !intParameters.ContainsKey(parameter);
+        generateButton.Tag = parameter;
+        generateButton.Enabled = intParameters.ContainsKey(parameter);
+        generateButton.Visible = true;
         return;
       }
@@ -209 +203 @@
       var doubleValue = parameter.Value as ValueTypeValue<double>;
       if (doubleValue != null) {
-        detailsTypeLabel.Text = "Double parameter:";
-        if (!doubleParameters.ContainsKey(parameter)) return;
-        string min = doubleParameters[parameter].Item1.ToString();
-        string max = doubleParameters[parameter].Item2.ToString();
-        string step = doubleParameters[parameter].Item3.ToString();
-        UpdateMinMaxStepSize(parameter, min, max, step);
+        if (doubleParameters.ContainsKey(parameter))
+          stringConvertibleArrayView.Content = doubleParameters[parameter];
+        stringConvertibleArrayView.Visible = true;
+        stringConvertibleArrayView.ReadOnly = !doubleParameters.ContainsKey(parameter);
+        generateButton.Tag = parameter;
+        generateButton.Enabled = doubleParameters.ContainsKey(parameter);
+        generateButton.Visible = true;
         return;
       }
@@ -222 +217 @@
     private void choiceListView_ItemChecked(object sender, ItemCheckedEventArgs e) {
       var parameter = (IValueParameter)choicesListView.Tag;
-      if (e.Item.Checked) {
-        multipleChoiceParameters[parameter].Add((IItem)e.Item.Tag);
-      } else multipleChoiceParameters[parameter].Remove((IItem)e.Item.Tag);
-
-      UpdateVariationsLabel();
-    }
-
-    private void detailsTextBox_Validating(object sender, CancelEventArgs e) {
-      var parameter = (IValueParameter)((TextBox)sender).Tag;
-      errorProvider.Clear();
-
-      var intValue = parameter.Value as ValueTypeValue<int>;
-      if (intValue != null) {
-        int value;
-        if (!int.TryParse(((TextBox)sender).Text, out value)) {
-          errorProvider.SetError(((TextBox)sender), "Please enter a valid integer number.");
-          e.Cancel = true;
-        } else {
-          var before = intParameters[parameter];
-          var after = default(Tuple<int, int, int>);
-          if (sender == minimumTextBox) after = new Tuple<int, int, int>(value, before.Item2, before.Item3);
-          else if (sender == maximumTextBox) after = new Tuple<int, int, int>(before.Item1, value, before.Item3);
-          else if (sender == stepSizeTextBox) after = new Tuple<int, int, int>(before.Item1, before.Item2, value);
-          intParameters[parameter] = after;
-        }
-      }
-
-      var doubleValue = parameter.Value as ValueTypeValue<double>;
-      if (doubleValue != null) {
-        double value;
-        if (!double.TryParse(((TextBox)sender).Text, NumberStyles.Float, CultureInfo.CurrentCulture.NumberFormat, out value)) {
-          errorProvider.SetError(((TextBox)sender), "Please enter a valid number.");
-          e.Cancel = true;
-        } else {
-          var before = doubleParameters[parameter];
-          var after = default(Tuple<double, double, double>);
-          if (sender == minimumTextBox) after = new Tuple<double, double, double>(value, before.Item2, before.Item3);
-          else if (sender == maximumTextBox) after = new Tuple<double, double, double>(before.Item1, value, before.Item3);
-          else if (sender == stepSizeTextBox) after = new Tuple<double, double, double>(before.Item1, before.Item2, value);
-          doubleParameters[parameter] = after;
-        }
-      }
-
+      if (multipleChoiceParameters.ContainsKey(parameter)) {
+        if (e.Item.Checked) {
+          multipleChoiceParameters[parameter].Add((IItem)e.Item.Tag);
+        } else multipleChoiceParameters[parameter].Remove((IItem)e.Item.Tag);
+
+        UpdateVariationsLabel();
+      }
+    }
+
+    private void generateButton_Click(object sender, EventArgs e) {
+      var parameter = (IValueParameter)generateButton.Tag;
+      bool integerOnly = intParameters.ContainsKey(parameter);
+      double min = 0, max = 1, step = 1;
+      #region Try to calculate some meaningful values
+      if (integerOnly) {
+        int len = intParameters[parameter].Length;
+        if (len > 0) {
+          min = intParameters[parameter].Min();
+          max = intParameters[parameter].Max();
+          step = len >= 2 ? Math.Abs((intParameters[parameter][len - 1] - intParameters[parameter][len - 2])) : 1;
+        }
+      } else {
+        int len = doubleParameters[parameter].Length;
+        if (len > 0) {
+          min = doubleParameters[parameter].Min();
+          max = doubleParameters[parameter].Max();
+          step = len >= 2 ? Math.Abs((doubleParameters[parameter][len - 1] - doubleParameters[parameter][len - 2])) : 1;
+        }
+      }
+      #endregion
+      using (var dialog = new DefineArithmeticProgressionDialog(integerOnly, min, max, step)) {
+        if (dialog.ShowDialog() == DialogResult.OK) {
+          var values = dialog.Values;
+          if (integerOnly) {
+            intParameters[parameter].Reset -= new EventHandler(ValuesArray_Reset);
+            intParameters[parameter] = new IntArray(values.Select(x => (int)x).ToArray());
+            intParameters[parameter].Reset += new EventHandler(ValuesArray_Reset);
+            stringConvertibleArrayView.Content = intParameters[parameter];
+          } else {
+            doubleParameters[parameter].Reset -= new EventHandler(ValuesArray_Reset);
+            doubleParameters[parameter] = new DoubleArray(values.ToArray());
+            doubleParameters[parameter].Reset += new EventHandler(ValuesArray_Reset);
+            stringConvertibleArrayView.Content = doubleParameters[parameter];
+          }
+          UpdateVariationsLabel();
+        }
+      }
+    }
+
+    private void ValuesArray_Reset(object sender, EventArgs e) {
       UpdateVariationsLabel();
     }
@@ -459 +461 @@
       int intParameterVariations = 1;
       foreach (var intParam in intParameters.Values) {
-        if (intParam.Item3 == 0) continue;
-        intParameterVariations *= (intParam.Item2 - intParam.Item1) / intParam.Item3 + 1;
+        intParameterVariations *= Math.Max(intParam.Length, 1);
       }
       int doubleParameterVariations = 1;
       foreach (var doubleParam in doubleParameters.Values) {
-        if (doubleParam.Item3 == 0) continue;
-        doubleParameterVariations *= (int)Math.Floor((doubleParam.Item2 - doubleParam.Item1) / doubleParam.Item3) + 1;
+        doubleParameterVariations *= Math.Max(doubleParam.Length, 1);
       }
       int boolParameterVariations = 1;
@@ -480 +480 @@
 
     private void SetMode(DialogMode mode) {
-      createBatchRunCheckBox.Enabled = mode == DialogMode.Normal;
-      repetitionsNumericUpDown.Enabled = mode == DialogMode.Normal;
-      parametersSplitContainer.Enabled = mode == DialogMode.Normal || mode == DialogMode.DiscoveringInstances;
-      selectAllCheckBox.Enabled = mode == DialogMode.Normal;
-      selectNoneCheckBox.Enabled = mode == DialogMode.Normal;
-      instancesTreeView.Enabled = mode == DialogMode.Normal;
-      instancesTreeView.Visible = mode == DialogMode.Normal || mode == DialogMode.CreatingExperiment || mode == DialogMode.PreparingExperiment;
-      okButton.Enabled = mode == DialogMode.Normal;
-      okButton.Visible = mode != DialogMode.CreatingExperiment && mode != DialogMode.PreparingExperiment;
-      cancelButton.Enabled = mode != DialogMode.PreparingExperiment;
-      instanceDiscoveryProgressLabel.Visible = mode == DialogMode.DiscoveringInstances;
-      instanceDiscoveryProgressBar.Visible = mode == DialogMode.DiscoveringInstances;
-      experimentCreationProgressBar.Visible = mode == DialogMode.CreatingExperiment || mode == DialogMode.PreparingExperiment;
+      if (InvokeRequired) Invoke((Action<DialogMode>)SetMode, mode);
+      else {
+        createBatchRunCheckBox.Enabled = mode == DialogMode.Normal;
+        repetitionsNumericUpDown.Enabled = mode == DialogMode.Normal;
+        parametersSplitContainer.Enabled = mode == DialogMode.Normal || mode == DialogMode.DiscoveringInstances;
+        selectAllCheckBox.Enabled = mode == DialogMode.Normal;
+        selectNoneCheckBox.Enabled = mode == DialogMode.Normal;
+        instancesTreeView.Enabled = mode == DialogMode.Normal;
+        instancesTreeView.Visible = mode == DialogMode.Normal || mode == DialogMode.CreatingExperiment || mode == DialogMode.PreparingExperiment;
+        okButton.Enabled = mode == DialogMode.Normal;
+        okButton.Visible = mode != DialogMode.CreatingExperiment && mode != DialogMode.PreparingExperiment;
+        cancelButton.Enabled = mode != DialogMode.PreparingExperiment;
+        instanceDiscoveryProgressLabel.Visible = mode == DialogMode.DiscoveringInstances;
+        instanceDiscoveryProgressBar.Visible = mode == DialogMode.DiscoveringInstances;
+        experimentCreationProgressBar.Visible = mode == DialogMode.CreatingExperiment || mode == DialogMode.PreparingExperiment;
+      }
     }
 
     private void ClearDetailsView() {
-      minimumLabel.Visible = false;
-      minimumTextBox.Text = string.Empty;
-      minimumTextBox.Enabled = false;
-      minimumTextBox.Visible = false;
-      maximumLabel.Visible = false;
-      maximumTextBox.Text = string.Empty;
-      maximumTextBox.Enabled = false;
-      maximumTextBox.Visible = false;
-      stepSizeLabel.Visible = false;
-      stepSizeTextBox.Text = string.Empty;
-      stepSizeTextBox.Enabled = false;
-      stepSizeTextBox.Visible = false;
+      stringConvertibleArrayView.Visible = false;
+      stringConvertibleArrayView.Content = null;
+      stringConvertibleArrayView.ReadOnly = true;
+      generateButton.Visible = false;
+      detailsTypeLabel.Visible = false;
       choicesListView.Items.Clear();
       choicesListView.Enabled = false;
@@ -513 +509 @@
     }
 
-    private void UpdateMinMaxStepSize(IValueParameter parameter, string min, string max, string step) {
-      minimumLabel.Visible = true;
-      minimumTextBox.Text = min;
-      minimumTextBox.Enabled = true;
-      minimumTextBox.Visible = true;
-      minimumTextBox.Tag = parameter;
-      maximumLabel.Visible = true;
-      maximumTextBox.Text = max;
-      maximumTextBox.Enabled = true;
-      maximumTextBox.Visible = true;
-      maximumTextBox.Tag = parameter;
-      stepSizeLabel.Visible = true;
-      stepSizeTextBox.Text = step;
-      stepSizeTextBox.Enabled = true;
-      stepSizeTextBox.Visible = true;
-      stepSizeTextBox.Tag = parameter;
-    }
-
     private void UpdateVariationsLabel() {
       variationsLabel.Text = GetNumberOfVariations().ToString("#,#", CultureInfo.CurrentCulture);
@@ -538 +516 @@
     private IEnumerable<Dictionary<IValueParameter, int>> GetIntParameterConfigurations() {
       var configuration = new Dictionary<IValueParameter, int>();
-      var indices = new Dictionary<IValueParameter, int>();
+      var enumerators = new Dictionary<IValueParameter, IEnumerator<int>>();
       bool finished;
       do {
         foreach (var p in intParameters) {
-          if (!indices.ContainsKey(p.Key)) indices.Add(p.Key, 0);
-          var value = p.Value.Item1 + p.Value.Item3 * indices[p.Key];
-          configuration[p.Key] = value;
+          if (!enumerators.ContainsKey(p.Key)) {
+            enumerators[p.Key] = p.Value.GetEnumerator();
+            enumerators[p.Key].MoveNext();
+          }
+          configuration[p.Key] = enumerators[p.Key].Current;
         }
         yield return configuration;
 
         finished = true;
-        foreach (var p in intParameters.Keys) {
-          var newValue = intParameters[p].Item1 + intParameters[p].Item3 * (indices[p] + 1);
-          if (newValue > intParameters[p].Item2 || intParameters[p].Item3 == 0)
-            indices[p] = 0;
-          else {
-            indices[p]++;
+        foreach (var p in intParameters) {
+          if (!enumerators[p.Key].MoveNext()) {
+            enumerators[p.Key] = p.Value.GetEnumerator();
+            enumerators[p.Key].MoveNext();
+          } else {
             finished = false;
             break;
@@ -564 +543 @@
     private IEnumerable<Dictionary<IValueParameter, double>> GetDoubleParameterConfigurations() {
       var configuration = new Dictionary<IValueParameter, double>();
-      var indices = new Dictionary<IValueParameter, int>();
+      var enumerators = new Dictionary<IValueParameter, IEnumerator<double>>();
       bool finished;
       do {
         foreach (var p in doubleParameters) {
-          if (!indices.ContainsKey(p.Key)) indices.Add(p.Key, 0);
-          var value = p.Value.Item1 + p.Value.Item3 * indices[p.Key];
-          configuration[p.Key] = value;
+          if (!enumerators.ContainsKey(p.Key)) {
+            enumerators[p.Key] = p.Value.GetEnumerator();
+            enumerators[p.Key].MoveNext();
+          }
+          configuration[p.Key] = enumerators[p.Key].Current;
         }
         yield return configuration;
 
         finished = true;
-        foreach (var p in doubleParameters.Keys) {
-          var newValue = doubleParameters[p].Item1 + doubleParameters[p].Item3 * (indices[p] + 1);
-          if (newValue > doubleParameters[p].Item2 || doubleParameters[p].Item3 == 0)
-            indices[p] = 0;
-          else {
-            indices[p]++;
+        foreach (var p in doubleParameters) {
+          if (!enumerators[p.Key].MoveNext()) {
+            enumerators[p.Key] = p.Value.GetEnumerator();
+            enumerators[p.Key].MoveNext();
+          } else {
             finished = false;
             break;
@@ -732 +712 @@
       }
       if (localExperiment != null) {
-        // don't do GUI stuff in do_work
         // this step can take some time
+        SetMode(DialogMode.PreparingExperiment);
         experimentCreationBackgroundWorker.ReportProgress(-1);
         localExperiment.Prepare(true);
@@ -844 +824 @@
         experimentCreationProgressBar.Value = e.ProgressPercentage;
       } else {
-        SetMode(DialogMode.PreparingExperiment);
-
         experimentCreationProgressBar.Style = ProgressBarStyle.Marquee;
       }

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

@@ -125 +125 @@
     <EmbeddedResource Include="Documents\PSO_Schwefel.hl" />
     <None Include="Plugin.cs.frame" />
+    <Compile Include="DefineArithmeticProgressionDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DefineArithmeticProgressionDialog.Designer.cs">
+      <DependentUpon>DefineArithmeticProgressionDialog.cs</DependentUpon>
+    </Compile>
     <Compile Include="OptimizerSingleDocumentMainForm.cs">
       <SubType>Form</SubType>
@@ -238 +244 @@
       <Name>HeuristicLab.Core-3.3</Name>
       <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Data.Views\3.3\HeuristicLab.Data.Views-3.3.csproj">
+      <Project>{72104A0B-90E7-42F3-9ABE-9BBBADD4B943}</Project>
+      <Name>HeuristicLab.Data.Views-3.3</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">

trunk/sources/HeuristicLab.Optimizer/3.3/Plugin.cs.frame

@@ -34 +34 @@
   [PluginDependency("HeuristicLab.Core.Views", "3.3")]
   [PluginDependency("HeuristicLab.Data", "3.3")]
+  [PluginDependency("HeuristicLab.Data.Views", "3.3")]
   [PluginDependency("HeuristicLab.MainForm", "3.3")]
   [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]