Changeset 12821 for branches/crossvalidation-2434

Timestamp:

07/30/15 19:40:56 (9 years ago)

Author:

gkronber

Message:

#2434 fixed problems in persistence and cloning and 'data binding' between content and view

Location:

branches/crossvalidation-2434

Files:

• HeuristicLab.Algorithms.DataAnalysis.Views/3.4/CrossValidationView.cs (modified) (7 diffs)
• HeuristicLab.Algorithms.DataAnalysis/3.4/CrossValidation.cs (modified) (2 diffs)

branches/crossvalidation-2434/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/CrossValidationView.cs

@@ -62 +62 @@
         storeAlgorithmInEachRunCheckBox.Checked = true;
       } else {
+        disableUpdateToContent = true; // don't propagate changes from GUI elements back to the content
         Locked = ReadOnly = Content.ExecutionState == ExecutionState.Started;
         workersNumericUpDown.Value = Content.NumberOfWorkers.Value;
-        foldsNumericUpDown.Value = Content.Folds;
         samplesStartStringConvertibleValueView.Content = Content.SamplesStart;
         samplesEndStringConvertibleValueView.Content = Content.SamplesEnd;
         UpdateAlgorithmView();
         UpdateProblemView();
+        UpdateFolds();
         runCollectionView.Content = Content.Runs;
         algorithmParameterCollectionView.Content = ((IParameterizedNamedItem)Content).Parameters;
@@ -74 +75 @@
         executionTimeTextBox.Text = Content.ExecutionTime.ToString();
         storeAlgorithmInEachRunCheckBox.Checked = Content.StoreAlgorithmInEachRun;
+        disableUpdateToContent = false;
       }
     }
@@ -147 +149 @@
     #region Content Events
     private void Content_AlgorithmChanged(object sender, EventArgs e) {
+      disableUpdateToContent = true;
       UpdateAlgorithmView();
       UpdateFolds();
       UpdateProblemView();
       SetEnabledStateOfControls();
+      disableUpdateToContent = false;
     }
     private void UpdateAlgorithmView() {
@@ -162 +166 @@
     private void Content_ProblemChanged(object sender, EventArgs e) {
       if (Content.Problem != null) Content.Problem.Reset += Content_ProblemReset;
+      disableUpdateToContent = true;
       UpdateFolds();
       UpdateProblemView();
       SetEnabledStateOfControls();
+      disableUpdateToContent = false;
     }
 
     private void Content_ProblemReset(object sender, EventArgs e) {
+      disableUpdateToContent = true;
       UpdateFolds();
+      disableUpdateToContent = false;
     }
 
@@ -180 +188 @@
 
     private void Content_FoldsChanged(object sender, EventArgs e) {
+      disableUpdateToContent = true;
       UpdateFolds();
+      disableUpdateToContent = false;
     }
 
@@ -193 +203 @@
         partitionVariableComboBox.Items.Clear();
         partitionVariableComboBox.Items.Add(CrossValidation.NoPartitionVariable);
-        var ds = Content.Problem.ProblemData.Dataset;
-        var rows = Enumerable.Range(Content.SamplesStart.Value, Content.SamplesEnd.Value - Content.SamplesStart.Value);
-        foreach (var variable in Content.Problem.ProblemData.Dataset.DoubleVariables) {
-          if (Content.Problem.ProblemData.AllowedInputVariables.Contains(variable)) continue;
-          int distinctValues = ds.GetDoubleValues(variable, rows).Distinct().Count();
-          if (distinctValues < 2 || distinctValues > 20) continue;
-          partitionVariableComboBox.Items.Add(variable);
+        if (Content.Problem != null) {
+          var ds = Content.Problem.ProblemData.Dataset;
+          var rows = Enumerable.Range(Content.SamplesStart.Value, Content.SamplesEnd.Value - Content.SamplesStart.Value);
+          foreach (var variable in Content.Problem.ProblemData.Dataset.DoubleVariables) {
+            if (Content.Problem.ProblemData.AllowedInputVariables.Contains(variable)) continue;
+            int distinctValues = ds.GetDoubleValues(variable, rows).Distinct().Count();
+            if (distinctValues < 2 || distinctValues > 20) continue;
+            partitionVariableComboBox.Items.Add(variable);
+          }
         }
         partitionVariableComboBox.SelectedItem = Content.PartitionVariable;
@@ -256 +268 @@
     }
     private void workersNumericUpDown_ValueChanged(object sender, EventArgs e) {
-      if (Content != null)
+      if (Content != null && !disableUpdateToContent)
         Content.NumberOfWorkers.Value = (int)workersNumericUpDown.Value;
     }

branches/crossvalidation-2434/HeuristicLab.Algorithms.DataAnalysis/3.4/CrossValidation.cs

@@ -91 +91 @@
 
       folds = original.folds;
+      partitionVariable = original.partitionVariable;
       numberOfWorkers = cloner.Clone(original.numberOfWorkers);
       samplesStart = cloner.Clone(original.samplesStart);
@@ -195 +196 @@
     }
 
-    [Storable]
     // folds are either specified explicitly or by a variable from the dataset 
     public const string NoPartitionVariable = "<none>";
+    [Storable]
     private string partitionVariable = NoPartitionVariable;
     public string PartitionVariable {