Changeset 13711


Ignore:
Timestamp:
03/16/16 13:07:50 (3 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionEnsembleSolutionModelView.cs

    r13705 r13711  
    7171      }
    7272
     73      //forbid sorting
     74      protected override void SortItemsListView(SortOrder sortOrder) { }
     75
    7376      protected override void itemsListView_DragEnter(object sender, DragEventArgs e) {
    7477        validDragOperation = false;
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionEnsembleSolutionModelWeightsView.cs

    r13705 r13711  
    6767        var array = new DoubleArray(Content.Model.ModelWeights.ToArray());
    6868        array.Resizable = false;
    69         array.ElementNames = Content.Model.Models.Select(m => m.Name);
     69        array.ElementNames = Content.RegressionSolutions.Select(s => s.Name);
    7070
    7171        RegisterArrayEvents(array);
     
    9494        array[i] = modelWeights[i];
    9595
    96       array.ElementNames = Content.Model.Models.Select(m => m.Name);
     96      array.ElementNames = Content.RegressionSolutions.Select(s => s.Name);
    9797      averageEstimatesCheckBox.Checked = Content.Model.AverageModelEstimates;
    9898    }
     
    108108
    109109    private void averageEstimatesCheckBox_CheckedChanged(object sender, EventArgs e) {
     110      if (Content == null) return;
    110111      Content.Model.AverageModelEstimates = averageEstimatesCheckBox.Checked;
    111112    }
Note: See TracChangeset for help on using the changeset viewer.