Changeset 4561

Timestamp:

10/06/10 15:56:09 (14 years ago)

Author:

mkommend

Message:

updated cross validation (ticket #1199)

Location:

branches/HeuristicLab.Classification

Files:

• HeuristicLab.Algorithms.DataAnalysis.Views/3.3/CrossValidationView.Designer.cs (modified) (27 diffs)
• HeuristicLab.Algorithms.DataAnalysis.Views/3.3/CrossValidationView.cs (modified) (11 diffs)
• HeuristicLab.Algorithms.DataAnalysis.Views/3.3/HeuristicLab.Algorithms.DataAnalysis.Views.csproj (modified) (4 diffs)
• HeuristicLab.Algorithms.DataAnalysis/3.3/CrossValidation.cs (modified) (22 diffs)
• HeuristicLab.Algorithms.DataAnalysis/3.3/HeuristicLab.Algorithms.DataAnalysis-3.3.csproj (modified) (1 diff)

branches/HeuristicLab.Classification/HeuristicLab.Algorithms.DataAnalysis.Views/3.3/CrossValidationView.Designer.cs

@@ -75 +75 @@
       this.foldsTabPage = new System.Windows.Forms.TabPage();
       this.algorithmResultsCollectionView = new HeuristicLab.Algorithms.DataAnalysis.Views.AlgorithmResultsCollectionView();
+      this.runsTabPage = new System.Windows.Forms.TabPage();
+      this.storeAlgorithmInEachRunCheckBox = new System.Windows.Forms.CheckBox();
+      this.runCollectionView = new HeuristicLab.Optimization.Views.RunCollectionView();
       this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
@@ -85 +88 @@
       this.algorithmParametersTabPage.SuspendLayout();
       this.foldsTabPage.SuspendLayout();
+      this.runsTabPage.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -92 +96 @@
       this.errorProvider.SetIconPadding(this.nameTextBox, 2);
       this.nameTextBox.Location = new System.Drawing.Point(80, 0);
-      this.nameTextBox.Size = new System.Drawing.Size(574, 20);
+      this.nameTextBox.Size = new System.Drawing.Size(531, 20);
       // 
       // descriptionTextBox
       // 
       this.descriptionTextBox.Location = new System.Drawing.Point(80, 26);
-      this.descriptionTextBox.Size = new System.Drawing.Size(574, 20);
+      this.descriptionTextBox.Size = new System.Drawing.Size(531, 20);
       // 
       // startButton
@@ -146 +150 @@
       // 
       this.executionTimeTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-      this.executionTimeTextBox.Location = new System.Drawing.Point(519, 517);
+      this.executionTimeTextBox.Location = new System.Drawing.Point(476, 517);
       this.executionTimeTextBox.Name = "executionTimeTextBox";
       this.executionTimeTextBox.ReadOnly = true;
@@ -156 +160 @@
       this.executionTimeLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
       this.executionTimeLabel.AutoSize = true;
-      this.executionTimeLabel.Location = new System.Drawing.Point(430, 520);
+      this.executionTimeLabel.Location = new System.Drawing.Point(387, 520);
       this.executionTimeLabel.Name = "executionTimeLabel";
       this.executionTimeLabel.Size = new System.Drawing.Size(83, 13);
@@ -166 +170 @@
       this.foldsNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
-      this.foldsNumericUpDown.Location = new System.Drawing.Point(80, 81);
+      this.foldsNumericUpDown.Location = new System.Drawing.Point(389, 79);
       this.foldsNumericUpDown.Maximum = new decimal(new int[] {
             50,
@@ -173 +177 @@
             0});
       this.foldsNumericUpDown.Minimum = new decimal(new int[] {
-            1,
+            2,
             0,
             0,
             0});
       this.foldsNumericUpDown.Name = "foldsNumericUpDown";
-      this.foldsNumericUpDown.Size = new System.Drawing.Size(574, 20);
+      this.foldsNumericUpDown.Size = new System.Drawing.Size(222, 20);
       this.foldsNumericUpDown.TabIndex = 18;
       this.foldsNumericUpDown.ThousandsSeparator = true;
       this.foldsNumericUpDown.Value = new decimal(new int[] {
-            1,
+            2,
             0,
             0,
@@ -192 +196 @@
       // 
       this.foldsLabel.AutoSize = true;
-      this.foldsLabel.Location = new System.Drawing.Point(3, 83);
+      this.foldsLabel.Location = new System.Drawing.Point(333, 80);
       this.foldsLabel.Name = "foldsLabel";
       this.foldsLabel.Size = new System.Drawing.Size(35, 13);
@@ -202 +206 @@
       this.workersNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
-      this.workersNumericUpDown.Location = new System.Drawing.Point(80, 52);
+      this.workersNumericUpDown.Location = new System.Drawing.Point(389, 53);
       this.workersNumericUpDown.Maximum = new decimal(new int[] {
             50,
@@ -214 +218 @@
             0});
       this.workersNumericUpDown.Name = "workersNumericUpDown";
-      this.workersNumericUpDown.Size = new System.Drawing.Size(574, 20);
+      this.workersNumericUpDown.Size = new System.Drawing.Size(222, 20);
       this.workersNumericUpDown.TabIndex = 20;
       this.workersNumericUpDown.ThousandsSeparator = true;
@@ -228 +232 @@
       // 
       this.workersLabel.AutoSize = true;
-      this.workersLabel.Location = new System.Drawing.Point(3, 54);
+      this.workersLabel.Location = new System.Drawing.Point(333, 55);
       this.workersLabel.Name = "workersLabel";
       this.workersLabel.Size = new System.Drawing.Size(50, 13);
@@ -237 +241 @@
       // 
       this.samplesStartLabel.AutoSize = true;
-      this.samplesStartLabel.Location = new System.Drawing.Point(3, 110);
+      this.samplesStartLabel.Location = new System.Drawing.Point(3, 55);
       this.samplesStartLabel.Name = "samplesStartLabel";
       this.samplesStartLabel.Size = new System.Drawing.Size(75, 13);
@@ -246 +250 @@
       // 
       this.samplesEndLabel.AutoSize = true;
-      this.samplesEndLabel.Location = new System.Drawing.Point(3, 135);
+      this.samplesEndLabel.Location = new System.Drawing.Point(3, 80);
       this.samplesEndLabel.Name = "samplesEndLabel";
       this.samplesEndLabel.Size = new System.Drawing.Size(72, 13);
@@ -254 +258 @@
       // samplesEndStringConvertibleValueView
       // 
-      this.samplesEndStringConvertibleValueView.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
       this.samplesEndStringConvertibleValueView.Caption = "StringConvertibleValue View";
       this.samplesEndStringConvertibleValueView.Content = null;
       this.samplesEndStringConvertibleValueView.LabelVisible = false;
-      this.samplesEndStringConvertibleValueView.Location = new System.Drawing.Point(80, 132);
+      this.samplesEndStringConvertibleValueView.Location = new System.Drawing.Point(80, 79);
       this.samplesEndStringConvertibleValueView.Name = "samplesEndStringConvertibleValueView";
       this.samplesEndStringConvertibleValueView.ReadOnly = false;
-      this.samplesEndStringConvertibleValueView.Size = new System.Drawing.Size(577, 19);
+      this.samplesEndStringConvertibleValueView.Size = new System.Drawing.Size(247, 18);
       this.samplesEndStringConvertibleValueView.TabIndex = 24;
       // 
       // samplesStartStringConvertibleValueView
       // 
-      this.samplesStartStringConvertibleValueView.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
       this.samplesStartStringConvertibleValueView.Caption = "StringConvertibleValue View";
       this.samplesStartStringConvertibleValueView.Content = null;
       this.samplesStartStringConvertibleValueView.LabelVisible = false;
-      this.samplesStartStringConvertibleValueView.Location = new System.Drawing.Point(80, 107);
+      this.samplesStartStringConvertibleValueView.Location = new System.Drawing.Point(80, 54);
       this.samplesStartStringConvertibleValueView.Name = "samplesStartStringConvertibleValueView";
       this.samplesStartStringConvertibleValueView.ReadOnly = false;
-      this.samplesStartStringConvertibleValueView.Size = new System.Drawing.Size(577, 19);
+      this.samplesStartStringConvertibleValueView.Size = new System.Drawing.Size(247, 18);
       this.samplesStartStringConvertibleValueView.TabIndex = 22;
       // 
@@ -285 +285 @@
       this.tabControl.Controls.Add(this.algorithmTabPage);
       this.tabControl.Controls.Add(this.foldsTabPage);
-      this.tabControl.Location = new System.Drawing.Point(0, 157);
+      this.tabControl.Controls.Add(this.runsTabPage);
+      this.tabControl.Location = new System.Drawing.Point(0, 105);
       this.tabControl.Name = "tabControl";
       this.tabControl.SelectedIndex = 0;
-      this.tabControl.Size = new System.Drawing.Size(657, 351);
+      this.tabControl.Size = new System.Drawing.Size(614, 403);
       this.tabControl.TabIndex = 25;
       // 
@@ -301 +302 @@
       this.algorithmTabPage.Name = "algorithmTabPage";
       this.algorithmTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.algorithmTabPage.Size = new System.Drawing.Size(649, 325);
+      this.algorithmTabPage.Size = new System.Drawing.Size(606, 377);
       this.algorithmTabPage.TabIndex = 0;
       this.algorithmTabPage.Text = "Algorithm";
@@ -318 +319 @@
       this.algorithmNamedItemView.Name = "algorithmNamedItemView";
       this.algorithmNamedItemView.ReadOnly = false;
-      this.algorithmNamedItemView.Size = new System.Drawing.Size(637, 52);
+      this.algorithmNamedItemView.Size = new System.Drawing.Size(594, 52);
       this.algorithmNamedItemView.TabIndex = 29;
       // 
@@ -331 +332 @@
       this.algorithmTabControl.Name = "algorithmTabControl";
       this.algorithmTabControl.SelectedIndex = 0;
-      this.algorithmTabControl.Size = new System.Drawing.Size(635, 225);
+      this.algorithmTabControl.Size = new System.Drawing.Size(592, 277);
       this.algorithmTabControl.TabIndex = 28;
       // 
@@ -342 +343 @@
       this.algorithmProblemTabPage.Name = "algorithmProblemTabPage";
       this.algorithmProblemTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.algorithmProblemTabPage.Size = new System.Drawing.Size(627, 199);
+      this.algorithmProblemTabPage.Size = new System.Drawing.Size(584, 251);
       this.algorithmProblemTabPage.TabIndex = 0;
       this.algorithmProblemTabPage.Text = "Problem";
@@ -372 +373 @@
       this.algorithmProblemViewHost.Name = "algorithmProblemViewHost";
       this.algorithmProblemViewHost.ReadOnly = false;
-      this.algorithmProblemViewHost.Size = new System.Drawing.Size(615, 157);
+      this.algorithmProblemViewHost.Size = new System.Drawing.Size(572, 209);
       this.algorithmProblemViewHost.TabIndex = 0;
       this.algorithmProblemViewHost.ViewType = null;
@@ -393 +394 @@
       this.algorithmParametersTabPage.Name = "algorithmParametersTabPage";
       this.algorithmParametersTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.algorithmParametersTabPage.Size = new System.Drawing.Size(627, 199);
+      this.algorithmParametersTabPage.Size = new System.Drawing.Size(584, 251);
       this.algorithmParametersTabPage.TabIndex = 1;
       this.algorithmParametersTabPage.Text = "Parameters";
@@ -406 +407 @@
       this.algorithmParameterCollectionView.Name = "algorithmParameterCollectionView";
       this.algorithmParameterCollectionView.ReadOnly = false;
-      this.algorithmParameterCollectionView.Size = new System.Drawing.Size(621, 193);
+      this.algorithmParameterCollectionView.Size = new System.Drawing.Size(578, 245);
       this.algorithmParameterCollectionView.TabIndex = 0;
       // 
@@ -437 +438 @@
       this.foldsTabPage.Name = "foldsTabPage";
       this.foldsTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.foldsTabPage.Size = new System.Drawing.Size(649, 325);
+      this.foldsTabPage.Size = new System.Drawing.Size(606, 377);
       this.foldsTabPage.TabIndex = 1;
       this.foldsTabPage.Text = "Folds";
@@ -450 +451 @@
       this.algorithmResultsCollectionView.Name = "algorithmResultsCollectionView";
       this.algorithmResultsCollectionView.ReadOnly = true;
-      this.algorithmResultsCollectionView.Size = new System.Drawing.Size(643, 319);
+      this.algorithmResultsCollectionView.Size = new System.Drawing.Size(600, 371);
       this.algorithmResultsCollectionView.TabIndex = 0;
+      // 
+      // runsTabPage
+      // 
+      this.runsTabPage.Controls.Add(this.storeAlgorithmInEachRunCheckBox);
+      this.runsTabPage.Controls.Add(this.runCollectionView);
+      this.runsTabPage.Location = new System.Drawing.Point(4, 22);
+      this.runsTabPage.Name = "runsTabPage";
+      this.runsTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.runsTabPage.Size = new System.Drawing.Size(606, 377);
+      this.runsTabPage.TabIndex = 2;
+      this.runsTabPage.Text = "Runs";
+      this.runsTabPage.UseVisualStyleBackColor = true;
+      // 
+      // storeAlgorithmInEachRunCheckBox
+      // 
+      this.storeAlgorithmInEachRunCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+      this.storeAlgorithmInEachRunCheckBox.AutoSize = true;
+      this.storeAlgorithmInEachRunCheckBox.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;
+      this.storeAlgorithmInEachRunCheckBox.Checked = true;
+      this.storeAlgorithmInEachRunCheckBox.CheckState = System.Windows.Forms.CheckState.Checked;
+      this.storeAlgorithmInEachRunCheckBox.Location = new System.Drawing.Point(440, 4);
+      this.storeAlgorithmInEachRunCheckBox.Name = "storeAlgorithmInEachRunCheckBox";
+      this.storeAlgorithmInEachRunCheckBox.Size = new System.Drawing.Size(161, 17);
+      this.storeAlgorithmInEachRunCheckBox.TabIndex = 2;
+      this.storeAlgorithmInEachRunCheckBox.Text = "&Store Algorithm in each Run:";
+      this.toolTip.SetToolTip(this.storeAlgorithmInEachRunCheckBox, "Check to store a copy of the algorithm in each run.");
+      this.storeAlgorithmInEachRunCheckBox.UseVisualStyleBackColor = true;
+      this.storeAlgorithmInEachRunCheckBox.CheckedChanged += new System.EventHandler(this.storeAlgorithmInEachRunCheckBox_CheckedChanged);
+      // 
+      // runCollectionView
+      // 
+      this.runCollectionView.Caption = "RunCollection View";
+      this.runCollectionView.Content = null;
+      this.runCollectionView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.runCollectionView.Location = new System.Drawing.Point(3, 3);
+      this.runCollectionView.Name = "runCollectionView";
+      this.runCollectionView.ReadOnly = false;
+      this.runCollectionView.Size = new System.Drawing.Size(600, 371);
+      this.runCollectionView.TabIndex = 3;
       // 
       // openFileDialog
@@ -465 +505 @@
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
       this.Controls.Add(this.tabControl);
+      this.Controls.Add(this.executionTimeTextBox);
+      this.Controls.Add(this.executionTimeLabel);
+      this.Controls.Add(this.samplesStartStringConvertibleValueView);
+      this.Controls.Add(this.startButton);
+      this.Controls.Add(this.workersNumericUpDown);
+      this.Controls.Add(this.workersLabel);
       this.Controls.Add(this.samplesEndStringConvertibleValueView);
       this.Controls.Add(this.samplesEndLabel);
-      this.Controls.Add(this.samplesStartStringConvertibleValueView);
-      this.Controls.Add(this.samplesStartLabel);
-      this.Controls.Add(this.workersNumericUpDown);
-      this.Controls.Add(this.workersLabel);
+      this.Controls.Add(this.pauseButton);
       this.Controls.Add(this.foldsNumericUpDown);
       this.Controls.Add(this.foldsLabel);
-      this.Controls.Add(this.executionTimeTextBox);
-      this.Controls.Add(this.executionTimeLabel);
-      this.Controls.Add(this.startButton);
-      this.Controls.Add(this.pauseButton);
+      this.Controls.Add(this.samplesStartLabel);
       this.Controls.Add(this.stopButton);
       this.Controls.Add(this.resetButton);
       this.Name = "CrossValidationView";
-      this.Size = new System.Drawing.Size(657, 538);
+      this.Size = new System.Drawing.Size(614, 538);
       this.Controls.SetChildIndex(this.resetButton, 0);
       this.Controls.SetChildIndex(this.stopButton, 0);
+      this.Controls.SetChildIndex(this.samplesStartLabel, 0);
+      this.Controls.SetChildIndex(this.foldsLabel, 0);
+      this.Controls.SetChildIndex(this.foldsNumericUpDown, 0);
       this.Controls.SetChildIndex(this.pauseButton, 0);
+      this.Controls.SetChildIndex(this.samplesEndLabel, 0);
+      this.Controls.SetChildIndex(this.samplesEndStringConvertibleValueView, 0);
+      this.Controls.SetChildIndex(this.workersLabel, 0);
+      this.Controls.SetChildIndex(this.workersNumericUpDown, 0);
       this.Controls.SetChildIndex(this.startButton, 0);
+      this.Controls.SetChildIndex(this.samplesStartStringConvertibleValueView, 0);
       this.Controls.SetChildIndex(this.executionTimeLabel, 0);
       this.Controls.SetChildIndex(this.executionTimeTextBox, 0);
+      this.Controls.SetChildIndex(this.tabControl, 0);
       this.Controls.SetChildIndex(this.nameLabel, 0);
       this.Controls.SetChildIndex(this.descriptionLabel, 0);
       this.Controls.SetChildIndex(this.nameTextBox, 0);
       this.Controls.SetChildIndex(this.descriptionTextBox, 0);
-      this.Controls.SetChildIndex(this.foldsLabel, 0);
-      this.Controls.SetChildIndex(this.foldsNumericUpDown, 0);
-      this.Controls.SetChildIndex(this.workersLabel, 0);
-      this.Controls.SetChildIndex(this.workersNumericUpDown, 0);
-      this.Controls.SetChildIndex(this.samplesStartLabel, 0);
-      this.Controls.SetChildIndex(this.samplesStartStringConvertibleValueView, 0);
-      this.Controls.SetChildIndex(this.samplesEndLabel, 0);
-      this.Controls.SetChildIndex(this.samplesEndStringConvertibleValueView, 0);
-      this.Controls.SetChildIndex(this.tabControl, 0);
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       ((System.ComponentModel.ISupportInitialize)(this.foldsNumericUpDown)).EndInit();
@@ -509 +549 @@
       this.algorithmParametersTabPage.ResumeLayout(false);
       this.foldsTabPage.ResumeLayout(false);
+      this.runsTabPage.ResumeLayout(false);
+      this.runsTabPage.PerformLayout();
       this.ResumeLayout(false);
       this.PerformLayout();
@@ -545 +587 @@
     private Core.Views.ParameterCollectionView algorithmParameterCollectionView;
     private System.Windows.Forms.OpenFileDialog openFileDialog;
+    private System.Windows.Forms.TabPage runsTabPage;
+    private Optimization.Views.RunCollectionView runCollectionView;
+    private System.Windows.Forms.CheckBox storeAlgorithmInEachRunCheckBox;
   }
 }

branches/HeuristicLab.Classification/HeuristicLab.Algorithms.DataAnalysis.Views/3.3/CrossValidationView.cs

@@ -58 +58 @@
         algorithmParameterCollectionView.Content = null;
         algorithmResultsCollectionView.Content = null;
+        runCollectionView.Content = null;
+        storeAlgorithmInEachRunCheckBox.Checked = true;
       } else {
         Locked = ReadOnly = Content.ExecutionState == ExecutionState.Started;
@@ -66 +68 @@
         UpdateAlgorithmView();
         UpdateProblemView();
+        runCollectionView.Content = Content.Runs;
+        algorithmParameterCollectionView.Content = ((IParameterizedNamedItem)Content).Parameters;
         algorithmResultsCollectionView.Content = Content.ClonedAlgorithms;
         executionTimeTextBox.Text = Content.ExecutionTime.ToString();
+        storeAlgorithmInEachRunCheckBox.Checked = Content.StoreAlgorithmInEachRun;
       }
     }
@@ -81 +86 @@
       Content.ExecutionStateChanged += new EventHandler(Content_ExecutionStateChanged);
       Content.ExecutionTimeChanged += new EventHandler(Content_ExecutionTimeChanged);
+      Content.StoreAlgorithmInEachRunChanged += new EventHandler(Content_StoreAlgorithmInEachRunChanged);
     }
 
     protected override void DeregisterContentEvents() {
-      base.DeregisterContentEvents();
       Content.AlgorithmChanged -= new EventHandler(Content_AlgorithmChanged);
       Content.ProblemChanged -= new EventHandler(Content_ProblemChanged);
@@ -93 +98 @@
       Content.ExecutionStateChanged -= new EventHandler(Content_ExecutionStateChanged);
       Content.ExecutionTimeChanged -= new EventHandler(Content_ExecutionTimeChanged);
+      Content.StoreAlgorithmInEachRunChanged -= new EventHandler(Content_StoreAlgorithmInEachRunChanged);
+      base.DeregisterContentEvents();
     }
 
@@ -100 +107 @@
         base.SetEnabledStateOfControls();
         this.Enabled = Content != null;
+
         if (Content != null) {
-          algorithmNamedItemView.Enabled = Content.Algorithm != null;
-          algorithmTabControl.Enabled = Content.Algorithm != null;
-          samplesStartStringConvertibleValueView.Enabled = Content.Problem != null;
-          samplesEndStringConvertibleValueView.Enabled = Content.Problem != null;
-        }
-        SetEnabledStateOfExecutableButtons();
-      }
-    }
-    private void SetEnabledStateOfExecutableButtons() {
-      if (Content == null) {
-        startButton.Enabled = pauseButton.Enabled = stopButton.Enabled = resetButton.Enabled = false;
-        foldsNumericUpDown.Enabled = workersNumericUpDown.Enabled = false;
-        samplesStartStringConvertibleValueView.Enabled = samplesEndStringConvertibleValueView.Enabled = false;
-      } else {
-        startButton.Enabled = (Content.ExecutionState == ExecutionState.Prepared) || (Content.ExecutionState == ExecutionState.Paused);
-        pauseButton.Enabled = Content.ExecutionState == ExecutionState.Started;
-        stopButton.Enabled = (Content.ExecutionState == ExecutionState.Started) || (Content.ExecutionState == ExecutionState.Paused);
-        resetButton.Enabled = Content.ExecutionState != ExecutionState.Started;
-        foldsNumericUpDown.Enabled = Content.ExecutionState == ExecutionState.Prepared;
-        samplesStartStringConvertibleValueView.Enabled = Content.ExecutionState == ExecutionState.Prepared;
-        samplesEndStringConvertibleValueView.Enabled = Content.ExecutionState == ExecutionState.Prepared;
-        workersNumericUpDown.Enabled = (Content.ExecutionState == ExecutionState.Prepared) || (Content.ExecutionState == ExecutionState.Paused);
+          storeAlgorithmInEachRunCheckBox.Enabled = !ReadOnly;
+
+          algorithmNamedItemView.Enabled = Content.Algorithm != null && (Content.ExecutionState == ExecutionState.Prepared || Content.ExecutionState == ExecutionState.Stopped);
+          algorithmTabControl.Enabled = Content.Algorithm != null && (Content.ExecutionState == ExecutionState.Prepared || Content.ExecutionState == ExecutionState.Stopped);
+          foldsNumericUpDown.Enabled = Content.ExecutionState == ExecutionState.Prepared;
+          samplesStartStringConvertibleValueView.Enabled = Content.ExecutionState == ExecutionState.Prepared;
+          samplesEndStringConvertibleValueView.Enabled = Content.ExecutionState == ExecutionState.Prepared;
+          workersNumericUpDown.Enabled = (Content.ExecutionState == ExecutionState.Prepared) || (Content.ExecutionState == ExecutionState.Paused);
+
+          startButton.Enabled = (Content.ExecutionState == ExecutionState.Prepared) || (Content.ExecutionState == ExecutionState.Paused);
+          pauseButton.Enabled = Content.ExecutionState == ExecutionState.Started;
+          stopButton.Enabled = (Content.ExecutionState == ExecutionState.Started) || (Content.ExecutionState == ExecutionState.Paused);
+          resetButton.Enabled = Content.ExecutionState != ExecutionState.Started;
+        }
       }
     }
@@ -135 +135 @@
       algorithmNamedItemView.Content = Content.Algorithm;
       UpdateProblemView();
-      if (Content.Algorithm != null) algorithmParameterCollectionView.Content = Content.Algorithm.Parameters;
-      else algorithmParameterCollectionView.Content = null;
     }
 
@@ -159 +157 @@
       else {
         Locked = ReadOnly = Content.ExecutionState == ExecutionState.Started;
-        SetEnabledStateOfExecutableButtons();
+        SetEnabledStateOfControls();
       }
     }
@@ -174 +172 @@
       else
         ErrorHandling.ShowErrorDialog(this, e.Value);
+    }
+    private void Content_StoreAlgorithmInEachRunChanged(object sender, EventArgs e) {
+      if (InvokeRequired)
+        Invoke(new EventHandler(Content_StoreAlgorithmInEachRunChanged), sender, e);
+      else
+        storeAlgorithmInEachRunCheckBox.Checked = Content.StoreAlgorithmInEachRun;
     }
     #endregion
@@ -300 +304 @@
     private void algorithmTabPage_DragEnterOver(object sender, DragEventArgs e) {
       e.Effect = DragDropEffects.None;
-      if (ReadOnly)
-        return;
+      if (ReadOnly) return;
       Type type = e.Data.GetData("Type") as Type;
-      if ((type != null) && (typeof(IAlgorithm).IsAssignableFrom(type))) {
+      IAlgorithm algorithm = e.Data.GetData("Value") as IAlgorithm;
+      if ((type != null) && (typeof(IAlgorithm).IsAssignableFrom(type)) &&
+        algorithm != null && Content.ProblemType.IsAssignableFrom(algorithm.Problem.GetType())) {
         if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link;  // ALT key
         else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
@@ -321 +326 @@
     private void algorithmProblemTabPage_DragEnterOver(object sender, DragEventArgs e) {
       e.Effect = DragDropEffects.None;
+      if (ReadOnly) return;
       Type type = e.Data.GetData("Type") as Type;
-      if ((type != null) && (typeof(IDataAnalysisProblem).IsAssignableFrom(type)) &&
+      if ((type != null) && (Content.ProblemType.IsAssignableFrom(type)) &&
         (Content.Algorithm.ProblemType.IsAssignableFrom(type))) {
         if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link;  // ALT key
@@ -338 +344 @@
       }
     }
+
+    private void storeAlgorithmInEachRunCheckBox_CheckedChanged(object sender, EventArgs e) {
+      if (Content != null) Content.StoreAlgorithmInEachRun = storeAlgorithmInEachRunCheckBox.Checked;
+    }
     #endregion
   }

branches/HeuristicLab.Classification/HeuristicLab.Algorithms.DataAnalysis.Views/3.3/HeuristicLab.Algorithms.DataAnalysis.Views.csproj

@@ -102 +102 @@
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3">
-      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3.dll</HintPath>
-    </Reference>
     <Reference Include="HeuristicLab.Collections-3.3">
       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll</HintPath>
@@ -111 +108 @@
       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
     </Reference>
+    <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.2.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86" />
     <Reference Include="HeuristicLab.Core-3.3">
       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
@@ -131 +129 @@
     <Reference Include="HeuristicLab.Optimization-3.3">
       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Optimization.Views-3.3">
+      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization.Views-3.3.dll</HintPath>
     </Reference>
     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
@@ -142 +143 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Windows.Forms.DataVisualization, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />

branches/HeuristicLab.Classification/HeuristicLab.Algorithms.DataAnalysis/3.3/CrossValidation.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
@@ -35 +36 @@
   [Creatable("Data Analysis")]
   [StorableClass]
-  public sealed class CrossValidation : NamedItem, IOptimizer {
+  public sealed class CrossValidation : ParameterizedNamedItem, IAlgorithm {
     public CrossValidation()
       : base() {
@@ -44 +45 @@
       executionTime = TimeSpan.Zero;
       runs = new RunCollection();
+      runsCounter = 0;
 
       algorithm = null;
       clonedAlgorithms = new ItemCollection<IAlgorithm>();
       readOnlyClonedAlgorithms = null;
-
-      folds = new IntValue(1);
+      results = new ResultCollection();
+
+      folds = new IntValue(2);
       numberOfWorkers = new IntValue(1);
       samplesStart = new IntValue(0);
       samplesEnd = new IntValue(0);
-
+      storeAlgorithmInEachRun = false;
 
       RegisterEvents();
@@ -69 +72 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      if (ExecutionState == ExecutionState.Started) throw new InvalidOperationException(string.Format("Clone not allowed in execution state \"{0}\".", ExecutionState));
-      CrossValidation clone = new CrossValidation(false);
-      cloner.RegisterClonedObject(this, clone);
-      clone.name = name;
-      clone.description = description;
+      CrossValidation clone = (CrossValidation)base.Clone(cloner);
+      clone.DeregisterEvents();
       clone.executionState = executionState;
       clone.executionTime = executionTime;
+      clone.storeAlgorithmInEachRun = storeAlgorithmInEachRun;
       clone.runs = (RunCollection)cloner.Clone(runs);
+      clone.runsCounter = runsCounter;
       clone.algorithm = (IAlgorithm)cloner.Clone(algorithm);
       clone.clonedAlgorithms = (ItemCollection<IAlgorithm>)cloner.Clone(clonedAlgorithms);
@@ -102 +104 @@
           if (algorithm != null) DeregisterAlgorithmEvents();
           algorithm = value;
+          Parameters.Clear();
 
           if (algorithm != null) {
+            algorithm.StoreAlgorithmInEachRun = StoreAlgorithmInEachRun;
             RegisterAlgorithmEvents();
             algorithm.Prepare(true);
+            Parameters.AddRange(algorithm.Parameters);
           }
           OnAlgorithmChanged();
+          if (algorithm != null) OnProblemChanged();
           Prepare();
         }
       }
     }
+
 
     [Storable]
@@ -130 +137 @@
     }
 
+    IProblem IAlgorithm.Problem {
+      get { return Problem; }
+      set {
+        if (value != null && !ProblemType.IsInstanceOfType(value))
+          throw new ArgumentException("Only DataAnalysisProblems could be used for the cross validation.");
+        Problem = (IDataAnalysisProblem)value;
+      }
+    }
+    public Type ProblemType {
+      get { return typeof(IDataAnalysisProblem); }
+    }
+
     [Storable]
     private ItemCollection<IAlgorithm> clonedAlgorithms;
@@ -141 +160 @@
 
     [Storable]
+    private ResultCollection results;
+    public ResultCollection Results {
+      get { return results; }
+    }
+
+    [Storable]
     private IntValue folds;
     public IntValue Folds {
@@ -162 +187 @@
 
     [Storable]
+    private bool storeAlgorithmInEachRun;
+    public bool StoreAlgorithmInEachRun {
+      get { return storeAlgorithmInEachRun; }
+      set {
+        if (storeAlgorithmInEachRun != value) {
+          storeAlgorithmInEachRun = value;
+          OnStoreAlgorithmInEachRunChanged();
+        }
+      }
+    }
+
+    [Storable]
+    private int runsCounter;
+    [Storable]
     private RunCollection runs;
     public RunCollection Runs {
       get { return runs; }
     }
+
     [Storable]
     private ExecutionState executionState;
@@ -192 +232 @@
     public TimeSpan ExecutionTime {
       get {
-        if (ExecutionState != ExecutionState.Stopped)
+        if (ExecutionState != ExecutionState.Stopped && ExecutionState != ExecutionState.Prepared)
           return executionTime + TimeSpan.FromMilliseconds(clonedAlgorithms.Select(x => x.ExecutionTime.TotalMilliseconds).Sum());
         else
@@ -227 +267 @@
         //create cloned algorithms
         if (clonedAlgorithms.Count == 0) {
+          int testSamplesCount = (SamplesEnd.Value - SamplesStart.Value) / Folds.Value;
           for (int i = 0; i < Folds.Value; i++) {
             IAlgorithm clonedAlgorithm = (IAlgorithm)algorithm.Clone();
             clonedAlgorithm.Name = algorithm.Name + " Fold " + i;
+            IDataAnalysisProblem problem = clonedAlgorithm.Problem as IDataAnalysisProblem;
+            problem.DataAnalysisProblemData.TestSamplesEnd.Value = (i + 1) == Folds.Value ? SamplesEnd.Value : (i + 1) * testSamplesCount + SamplesStart.Value;
+            problem.DataAnalysisProblemData.TestSamplesStart.Value = (i * testSamplesCount) + SamplesStart.Value;
             clonedAlgorithms.Add(clonedAlgorithm);
           }
@@ -283 +327 @@
     }
 
+    #region collect parameters and results
+    public override void CollectParameterValues(IDictionary<string, IItem> values) {
+      values.Add("Algorithm Name", new StringValue(Name));
+      values.Add("Algorithm Type", new StringValue(GetType().GetPrettyName()));
+      values.Add("Folds", new IntValue(Folds.Value));
+
+      if (algorithm != null) {
+        values.Add("CrossValidation Algorithm Name", new StringValue(Algorithm.Name));
+        values.Add("CrossValidation Algorithm Type", new StringValue(Algorithm.GetType().GetPrettyName()));
+        base.CollectParameterValues(values);
+      }
+      if (Problem != null) {
+        values.Add("Problem Name", new StringValue(Problem.Name));
+        values.Add("Problem Type", new StringValue(Problem.GetType().GetPrettyName()));
+        Problem.CollectParameterValues(values);
+      }
+    }
+
+    public void CollectResultValues(IDictionary<string, IItem> results) {
+      Dictionary<string, List<double>> resultValues = new Dictionary<string, List<double>>();
+      IEnumerable<IRun> runs = ClonedAlgorithms.Select(alg => alg.Runs.FirstOrDefault()).Where(run => run != null);
+      IEnumerable<KeyValuePair<string, IItem>> resultCollections = runs.Where(x => x != null).SelectMany(x => x.Results).ToList();
+
+      foreach (IResult result in ExtractAndAggregateResults<IntValue>(resultCollections))
+        results.Add(result.Name, result.Value);
+      foreach (IResult result in ExtractAndAggregateResults<DoubleValue>(resultCollections))
+        results.Add(result.Name, result.Value);
+      foreach (IResult result in ExtractAndAggregateResults<PercentValue>(resultCollections))
+        results.Add(result.Name, result.Value);
+
+      results.Add("Execution Time", new TimeSpanValue(TimeSpan.FromMilliseconds(clonedAlgorithms.Select(x => x.ExecutionTime.TotalMilliseconds).Sum())));
+      results.Add("CrossValidation Folds", new RunCollection(runs));
+    }
+
+    private static IEnumerable<IResult> ExtractAndAggregateResults<T>(IEnumerable<KeyValuePair<string, IItem>> results)
+  where T : class, IItem, new() {
+      Dictionary<string, List<double>> resultValues = new Dictionary<string, List<double>>();
+      foreach (var resultValue in results.Where(r => r.Value.GetType() == typeof(T))) {
+        if (!resultValues.ContainsKey(resultValue.Key))
+          resultValues[resultValue.Key] = new List<double>();
+        resultValues[resultValue.Key].Add(ConvertToDouble(resultValue.Value));
+      }
+
+      DoubleValue doubleValue;
+      if (typeof(T) == typeof(PercentValue))
+        doubleValue = new PercentValue();
+      else if (typeof(T) == typeof(DoubleValue))
+        doubleValue = new DoubleValue();
+      else if (typeof(T) == typeof(IntValue))
+        doubleValue = new DoubleValue();
+      else
+        throw new NotSupportedException();
+
+      List<IResult> aggregatedResults = new List<IResult>();
+      foreach (KeyValuePair<string, List<double>> resultValue in resultValues) {
+        doubleValue.Value = resultValue.Value.Average();
+        aggregatedResults.Add(new Result(resultValue.Key, (IItem)doubleValue.Clone()));
+        doubleValue.Value = resultValue.Value.StandardDeviation();
+        aggregatedResults.Add(new Result(resultValue.Key + " StdDev", (IItem)doubleValue.Clone()));
+      }
+      return aggregatedResults;
+    }
+
+    private static double ConvertToDouble(IItem item) {
+      if (item is DoubleValue) return ((DoubleValue)item).Value;
+      else if (item is IntValue) return ((IntValue)item).Value;
+      else throw new NotSupportedException("Could not convert any item type to double");
+    }
+
+    #endregion
+
     #region events
     private void RegisterEvents() {
       Folds.ValueChanged += new EventHandler(Folds_ValueChanged);
-      NumberOfWorkers.ValueChanged += new EventHandler(NumberOfWorkers_ValueChanged);
+      SamplesStart.ValueChanged += new EventHandler(SamplesStart_ValueChanged);
+      SamplesEnd.ValueChanged += new EventHandler(SamplesEnd_ValueChanged);
       RegisterClonedAlgorithmsEvents();
       RegisterRunsEvents();
+    }
+    private void DeregisterEvents() {
+      Folds.ValueChanged -= new EventHandler(Folds_ValueChanged);
+      SamplesStart.ValueChanged -= new EventHandler(SamplesStart_ValueChanged);
+      SamplesEnd.ValueChanged -= new EventHandler(SamplesEnd_ValueChanged);
+      DeregisterClonedAlgorithmsEvents();
+      DeregisterRunsEvents();
+
     }
     private void Folds_ValueChanged(object sender, EventArgs e) {
@@ -294 +418 @@
         throw new InvalidOperationException("Can not change number of folds if the execution state is not prepared.");
     }
-    private void NumberOfWorkers_ValueChanged(object sender, EventArgs e) {
-      if (ExecutionState == ExecutionState.Started) {
-        int workers = numberOfWorkers.Value;
-        int runningWorkers = clonedAlgorithms.Count(alg => alg.ExecutionState == ExecutionState.Started);
-
-        foreach (IAlgorithm algorithm in clonedAlgorithms) {
-          if (algorithm.ExecutionState == ExecutionState.Prepared ||
-              algorithm.ExecutionState == ExecutionState.Paused) {
-            if (runningWorkers < workers) {
-              algorithm.Start();
-              runningWorkers++;
-            }
-          } else if (algorithm.ExecutionState == ExecutionState.Started) {
-            if (runningWorkers > workers) {
-              algorithm.Pause();
-              runningWorkers--;
-            }
-          }
-        }
-      }
+    private void SamplesStart_ValueChanged(object sender, EventArgs e) {
+      if (Problem != null) Problem.DataAnalysisProblemData.TrainingSamplesStart.Value = SamplesStart.Value;
+    }
+    private void SamplesEnd_ValueChanged(object sender, EventArgs e) {
+      if (Problem != null) Problem.DataAnalysisProblemData.TrainingSamplesEnd.Value = SamplesEnd.Value;
     }
 
@@ -338 +447 @@
       }
       cachedProblem = (IDataAnalysisProblem)algorithm.Problem;
+      OnProblemChanged();
+    }
+    public event EventHandler ProblemChanged;
+    private void OnProblemChanged() {
+      EventHandler handler = ProblemChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+
       SamplesStart.Value = 0;
-      if (algorithm.Problem != null)
+      if (Problem != null)
         SamplesEnd.Value = Problem.DataAnalysisProblemData.Dataset.Rows;
       else
         SamplesEnd.Value = 0;
-      OnProblemChanged();
-    }
-    public event EventHandler ProblemChanged;
-    private void OnProblemChanged() {
-      EventHandler handler = ProblemChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
     }
 
@@ -371 +481 @@
         RegisterClonedAlgorithmEvents(algorithm);
     }
+    private void DeregisterClonedAlgorithmsEvents() {
+      clonedAlgorithms.ItemsAdded -= new CollectionItemsChangedEventHandler<IAlgorithm>(ClonedAlgorithms_ItemsAdded);
+      clonedAlgorithms.ItemsRemoved -= new CollectionItemsChangedEventHandler<IAlgorithm>(ClonedAlgorithms_ItemsRemoved);
+      clonedAlgorithms.CollectionReset -= new CollectionItemsChangedEventHandler<IAlgorithm>(ClonedAlgorithms_CollectionReset);
+      foreach (IAlgorithm algorithm in clonedAlgorithms)
+        DeregisterClonedAlgorithmEvents(algorithm);
+    }
     private void ClonedAlgorithms_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IAlgorithm> e) {
       foreach (IAlgorithm algorithm in e.Items)
@@ -435 +552 @@
           if (preparedAlgorithm != null) preparedAlgorithm.Start();
         }
-        if (clonedAlgorithms.All(alg => alg.ExecutionState == ExecutionState.Stopped))
-          OnStopped();
-        else if (stopPending && clonedAlgorithms.All(alg => alg.ExecutionState == ExecutionState.Prepared || alg.ExecutionState == ExecutionState.Stopped))
-          OnStopped();
+        if (ExecutionState != ExecutionState.Stopped) {
+          if (clonedAlgorithms.All(alg => alg.ExecutionState == ExecutionState.Stopped))
+            OnStopped();
+          else if (stopPending &&
+                   clonedAlgorithms.All(
+                     alg => alg.ExecutionState == ExecutionState.Prepared || alg.ExecutionState == ExecutionState.Stopped))
+            OnStopped();
+        }
       }
     }
@@ -449 +570 @@
       runs.ItemsRemoved += new CollectionItemsChangedEventHandler<IRun>(Runs_ItemsRemoved);
     }
+    private void DeregisterRunsEvents() {
+      runs.CollectionReset -= new CollectionItemsChangedEventHandler<IRun>(Runs_CollectionReset);
+      runs.ItemsAdded -= new CollectionItemsChangedEventHandler<IRun>(Runs_ItemsAdded);
+      runs.ItemsRemoved -= new CollectionItemsChangedEventHandler<IRun>(Runs_ItemsRemoved);
+    }
     private void Runs_CollectionReset(object sender, CollectionItemsChangedEventArgs<IRun> e) {
       foreach (IRun run in e.OldItems) {
@@ -454 +580 @@
         run.Results.TryGetValue("Execution Time", out item);
         TimeSpanValue executionTime = item as TimeSpanValue;
-        if (executionTime != null) ExecutionTime -= executionTime.Value;
+        if (executionTime != null) ExecutionTime = this.executionTime - executionTime.Value;
       }
       foreach (IRun run in e.Items) {
@@ -460 +586 @@
         run.Results.TryGetValue("Execution Time", out item);
         TimeSpanValue executionTime = item as TimeSpanValue;
-        if (executionTime != null) ExecutionTime += executionTime.Value;
-      }
+        if (executionTime != null) ExecutionTime = this.executionTime + executionTime.Value;
+      }
+      runsCounter = Runs.Count;
     }
     private void Runs_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IRun> e) {
@@ -468 +595 @@
         run.Results.TryGetValue("Execution Time", out item);
         TimeSpanValue executionTime = item as TimeSpanValue;
-        if (executionTime != null) ExecutionTime += executionTime.Value;
+        if (executionTime != null) this.executionTime = this.executionTime + executionTime.Value;
       }
     }
@@ -476 +603 @@
         run.Results.TryGetValue("Execution Time", out item);
         TimeSpanValue executionTime = item as TimeSpanValue;
-        if (executionTime != null) ExecutionTime -= executionTime.Value;
+        if (executionTime != null) ExecutionTime = this.executionTime - executionTime.Value;
       }
     }
@@ -516 +643 @@
     private void OnStopped() {
       stopPending = false;
+      runsCounter++;
+      runs.Add(new Run(string.Format("{0} Run {1}", Name, runsCounter), this));
       ExecutionState = ExecutionState.Stopped;
-      //TODO create run;
       EventHandler handler = Stopped;
       if (handler != null) handler(this, EventArgs.Empty);
@@ -526 +654 @@
       if (handler != null) handler(this, new EventArgs<Exception>(exception));
     }
+    public event EventHandler StoreAlgorithmInEachRunChanged;
+    private void OnStoreAlgorithmInEachRunChanged() {
+      EventHandler handler = StoreAlgorithmInEachRunChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
     #endregion
   }

branches/HeuristicLab.Classification/HeuristicLab.Algorithms.DataAnalysis/3.3/HeuristicLab.Algorithms.DataAnalysis-3.3.csproj

@@ -148 +148 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
   </ItemGroup>