Changeset 13705


Ignore:
Timestamp:
03/15/16 15:49:52 (5 years ago)
Author:
mkommend
Message:

#2590: Added view for ensemble weights.

Location:
trunk/sources
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

    r13102 r13705  
    195195    <Compile Include="ProblemDataView.Designer.cs">
    196196      <DependentUpon>ProblemDataView.cs</DependentUpon>
     197    </Compile>
     198    <Compile Include="Regression\RegressionEnsembleSolutionModelWeightsView.cs">
     199      <SubType>UserControl</SubType>
     200    </Compile>
     201    <Compile Include="Regression\RegressionEnsembleSolutionModelWeightsView.Designer.cs">
     202      <DependentUpon>RegressionEnsembleSolutionModelWeightsView.cs</DependentUpon>
    197203    </Compile>
    198204    <Compile Include="Regression\RegressionFeatureCorrelationView.cs">
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionEnsembleSolutionModelView.cs

    r12012 r13705  
    6363      protected override void SetEnabledStateOfControls() {
    6464        base.SetEnabledStateOfControls();
    65         addButton.Enabled = Content != null && !Content.IsReadOnly && !Locked;
    66         removeButton.Enabled = Content != null && !Content.IsReadOnly && !Locked && itemsListView.SelectedItems.Count > 0;
     65        addButton.Enabled = false;
     66        removeButton.Enabled = Content != null && !Content.IsReadOnly && !Locked && !ReadOnly && itemsListView.SelectedItems.Count > 0;
    6767        itemsListView.Enabled = Content != null && !Locked;
    6868        detailsGroupBox.Enabled = Content != null && itemsListView.SelectedItems.Count == 1;
     69        sortAscendingButton.Enabled = false;
     70        sortDescendingButton.Enabled = false;
    6971      }
    7072
  • trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionEnsembleModel.cs

    r13704 r13705  
    155155    public IEnumerable<IEnumerable<double>> GetEstimatedValueVectors(IDataset dataset, IEnumerable<int> rows) {
    156156      var estimatedValuesEnumerators = (from model in models
    157                                         select model.GetEstimatedValues(dataset, rows).GetEnumerator())
    158                                        .ToList();
     157                                        let weight = GetModelWeight(model)
     158                                        select model.GetEstimatedValues(dataset, rows).Select(e => weight * e)
     159                                        .GetEnumerator()).ToList();
    159160
    160161      while (estimatedValuesEnumerators.All(en => en.MoveNext())) {
Note: See TracChangeset for help on using the changeset viewer.