Changeset 13711 for trunk

Timestamp:

03/16/16 13:07:50 (9 years ago)

Author:

mkommend

Message:

#2590: Fixed bugs in Regression ensembles (ordering of solutions and weighting).

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression

Files:

• RegressionEnsembleSolutionModelView.cs (modified) (1 diff)
• RegressionEnsembleSolutionModelWeightsView.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionEnsembleSolutionModelView.cs

@@ -71 +71 @@
       }
 
+      //forbid sorting
+      protected override void SortItemsListView(SortOrder sortOrder) { }
+
       protected override void itemsListView_DragEnter(object sender, DragEventArgs e) {
         validDragOperation = false;

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionEnsembleSolutionModelWeightsView.cs

@@ -67 +67 @@
         var array = new DoubleArray(Content.Model.ModelWeights.ToArray());
         array.Resizable = false;
-        array.ElementNames = Content.Model.Models.Select(m => m.Name);
+        array.ElementNames = Content.RegressionSolutions.Select(s => s.Name);
 
         RegisterArrayEvents(array);
@@ -94 +94 @@
         array[i] = modelWeights[i];
 
-      array.ElementNames = Content.Model.Models.Select(m => m.Name);
+      array.ElementNames = Content.RegressionSolutions.Select(s => s.Name);
       averageEstimatesCheckBox.Checked = Content.Model.AverageModelEstimates;
     }
@@ -108 +108 @@
 
     private void averageEstimatesCheckBox_CheckedChanged(object sender, EventArgs e) {
+      if (Content == null) return;
       Content.Model.AverageModelEstimates = averageEstimatesCheckBox.Checked;
     }