Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
11/26/16 21:47:10 (7 years ago)
Author:
gkronber
Message:

#2650: merged r14405:14418 from trunk to branch

Location:
branches/symbreg-factors-2650
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/symbreg-factors-2650

  • branches/symbreg-factors-2650/HeuristicLab.DataPreprocessing.Views

  • branches/symbreg-factors-2650/HeuristicLab.DataPreprocessing.Views/3.4/HeuristicLab.DataPreprocessing.Views-3.4.csproj

    r14401 r14421  
    9898  <ItemGroup>
    9999    <Compile Include="DataPreprocessingMenuItem.cs" />
    100     <Compile Include="PreprocessingChartView.cs">
    101       <SubType>UserControl</SubType>
    102     </Compile>
     100    <Compile Include="PreprocessingFeatureCorrelationView.cs">
     101      <SubType>UserControl</SubType>
     102    </Compile>
     103    <Compile Include="PreprocessingFeatureCorrelationView.Designer.cs">
     104      <DependentUpon>PreprocessingFeatureCorrelationView.cs</DependentUpon>
     105    </Compile>
     106    <Compile Include="CheckedFilterCollectionView.cs">
     107      <SubType>UserControl</SubType>
     108    </Compile>
     109    <Compile Include="CheckedFilterCollectionView.Designer.cs">
     110      <DependentUpon>CheckedFilterCollectionView.cs</DependentUpon>
     111    </Compile>
     112    <Compile Include="CheckedTransformationListView.cs">
     113      <SubType>UserControl</SubType>
     114    </Compile>
     115    <Compile Include="CheckedTransformationListView.Designer.cs">
     116      <DependentUpon>CheckedTransformationListView.cs</DependentUpon>
     117    </Compile>
     118    <Compile Include="ComparisonFilterView.cs">
     119      <SubType>UserControl</SubType>
     120    </Compile>
     121    <Compile Include="ComparisonFilterView.Designer.cs">
     122      <DependentUpon>ComparisonFilterView.cs</DependentUpon>
     123    </Compile>
     124    <Compile Include="RenameColumnsDialog.cs">
     125      <SubType>Form</SubType>
     126    </Compile>
     127    <Compile Include="RenameColumnsDialog.Designer.cs">
     128      <DependentUpon>RenameColumnsDialog.cs</DependentUpon>
     129    </Compile>
     130    <Compile Include="ScatterPlotSingleView.cs">
     131      <SubType>UserControl</SubType>
     132    </Compile>
     133    <Compile Include="ScatterPlotSingleView.Designer.cs">
     134      <DependentUpon>ScatterPlotSingleView.cs</DependentUpon>
     135    </Compile>
     136    <Compile Include="DataCompletenessView.cs">
     137      <SubType>UserControl</SubType>
     138    </Compile>
     139    <Compile Include="DataCompletenessView.Designer.cs">
     140      <DependentUpon>DataCompletenessView.cs</DependentUpon>
     141    </Compile>
     142    <Compile Include="DataGridContentView.cs">
     143      <SubType>UserControl</SubType>
     144    </Compile>
     145    <Compile Include="DataGridContentView.Designer.cs">
     146      <DependentUpon>DataGridContentView.cs</DependentUpon>
     147    </Compile>
     148    <Compile Include="DataPreprocessingView.cs">
     149      <SubType>UserControl</SubType>
     150    </Compile>
     151    <Compile Include="DataPreprocessingView.designer.cs">
     152      <DependentUpon>DataPreprocessingView.cs</DependentUpon>
     153    </Compile>
     154    <Compile Include="DataPreprocessorStarter.cs" />
     155    <Compile Include="PreprocessingDataTableView.cs">
     156      <SubType>UserControl</SubType>
     157    </Compile>
     158    <Compile Include="PreprocessingDataTableView.Designer.cs">
     159      <DependentUpon>PreprocessingDataTableView.cs</DependentUpon>
     160    </Compile>
     161    <Compile Include="FilterView.cs">
     162      <SubType>UserControl</SubType>
     163    </Compile>
     164    <Compile Include="FilterView.Designer.cs">
     165      <DependentUpon>FilterView.cs</DependentUpon>
     166    </Compile>
     167    <Compile Include="ScatterPlotMultiView.cs" />
     168    <Compile Include="ScatterPlotMultiView.Designer.cs">
     169      <DependentUpon>ScatterPlotMultiView.cs</DependentUpon>
     170    </Compile>
     171    <Compile Include="PreprocessingScatterPlotView.cs">
     172      <SubType>UserControl</SubType>
     173    </Compile>
     174    <Compile Include="PreprocessingScatterPlotView.Designer.cs">
     175      <DependentUpon>PreprocessingScatterPlotView.cs</DependentUpon>
     176    </Compile>
     177    <Compile Include="SearchAndReplaceDialog.cs">
     178      <SubType>Form</SubType>
     179    </Compile>
     180    <Compile Include="SearchAndReplaceDialog.Designer.cs">
     181      <DependentUpon>SearchAndReplaceDialog.cs</DependentUpon>
     182    </Compile>
     183    <Compile Include="HistogramView.cs" />
     184    <Compile Include="HistogramView.Designer.cs">
     185      <DependentUpon>HistogramView.cs</DependentUpon>
     186    </Compile>
     187    <Compile Include="LineChartView.cs" />
     188    <Compile Include="LineChartView.Designer.cs">
     189      <DependentUpon>LineChartView.cs</DependentUpon>
     190    </Compile>
     191    <Compile Include="ManipulationView.cs">
     192      <SubType>UserControl</SubType>
     193    </Compile>
     194    <Compile Include="ManipulationView.Designer.cs">
     195      <DependentUpon>ManipulationView.cs</DependentUpon>
     196    </Compile>
     197    <Compile Include="Plugin.cs" />
     198    <Compile Include="PreprocessingChartView.cs" />
    103199    <Compile Include="PreprocessingChartView.Designer.cs">
    104200      <DependentUpon>PreprocessingChartView.cs</DependentUpon>
    105     </Compile>
    106     <Compile Include="PreprocessingFeatureCorrelationView.cs">
    107       <SubType>UserControl</SubType>
    108     </Compile>
    109     <Compile Include="PreprocessingFeatureCorrelationView.Designer.cs">
    110       <DependentUpon>PreprocessingFeatureCorrelationView.cs</DependentUpon>
    111     </Compile>
    112     <Compile Include="CheckedFilterCollectionView.cs">
    113       <SubType>UserControl</SubType>
    114     </Compile>
    115     <Compile Include="CheckedFilterCollectionView.Designer.cs">
    116       <DependentUpon>CheckedFilterCollectionView.cs</DependentUpon>
    117     </Compile>
    118     <Compile Include="CheckedTransformationListView.cs">
    119       <SubType>UserControl</SubType>
    120     </Compile>
    121     <Compile Include="CheckedTransformationListView.Designer.cs">
    122       <DependentUpon>CheckedTransformationListView.cs</DependentUpon>
    123     </Compile>
    124     <Compile Include="ComparisonFilterView.cs">
    125       <SubType>UserControl</SubType>
    126     </Compile>
    127     <Compile Include="ComparisonFilterView.Designer.cs">
    128       <DependentUpon>ComparisonFilterView.cs</DependentUpon>
    129     </Compile>
    130     <Compile Include="RenameColumnsDialog.cs">
    131       <SubType>Form</SubType>
    132     </Compile>
    133     <Compile Include="RenameColumnsDialog.Designer.cs">
    134       <DependentUpon>RenameColumnsDialog.cs</DependentUpon>
    135     </Compile>
    136     <Compile Include="ScatterPlotSingleView.cs">
    137       <SubType>UserControl</SubType>
    138     </Compile>
    139     <Compile Include="ScatterPlotSingleView.Designer.cs">
    140       <DependentUpon>ScatterPlotSingleView.cs</DependentUpon>
    141     </Compile>
    142     <Compile Include="DataCompletenessView.cs">
    143       <SubType>UserControl</SubType>
    144     </Compile>
    145     <Compile Include="DataCompletenessView.Designer.cs">
    146       <DependentUpon>DataCompletenessView.cs</DependentUpon>
    147     </Compile>
    148     <Compile Include="DataGridContentView.cs">
    149       <SubType>UserControl</SubType>
    150     </Compile>
    151     <Compile Include="DataGridContentView.Designer.cs">
    152       <DependentUpon>DataGridContentView.cs</DependentUpon>
    153     </Compile>
    154     <Compile Include="DataPreprocessingView.cs">
    155       <SubType>UserControl</SubType>
    156     </Compile>
    157     <Compile Include="DataPreprocessingView.designer.cs">
    158       <DependentUpon>DataPreprocessingView.cs</DependentUpon>
    159     </Compile>
    160     <Compile Include="DataPreprocessorStarter.cs" />
    161     <Compile Include="PreprocessingDataTableView.cs">
    162       <SubType>UserControl</SubType>
    163     </Compile>
    164     <Compile Include="PreprocessingDataTableView.Designer.cs">
    165       <DependentUpon>PreprocessingDataTableView.cs</DependentUpon>
    166     </Compile>
    167     <Compile Include="FilterView.cs">
    168       <SubType>UserControl</SubType>
    169     </Compile>
    170     <Compile Include="FilterView.Designer.cs">
    171       <DependentUpon>FilterView.cs</DependentUpon>
    172     </Compile>
    173     <Compile Include="ScatterPlotMultiView.cs">
    174       <SubType>UserControl</SubType>
    175     </Compile>
    176     <Compile Include="ScatterPlotMultiView.Designer.cs">
    177       <DependentUpon>ScatterPlotMultiView.cs</DependentUpon>
    178     </Compile>
    179     <Compile Include="PreprocessingScatterPlotView.cs">
    180       <SubType>UserControl</SubType>
    181     </Compile>
    182     <Compile Include="PreprocessingScatterPlotView.Designer.cs">
    183       <DependentUpon>PreprocessingScatterPlotView.cs</DependentUpon>
    184     </Compile>
    185     <Compile Include="SearchAndReplaceDialog.cs">
    186       <SubType>Form</SubType>
    187     </Compile>
    188     <Compile Include="SearchAndReplaceDialog.Designer.cs">
    189       <DependentUpon>SearchAndReplaceDialog.cs</DependentUpon>
    190     </Compile>
    191     <Compile Include="HistogramView.cs">
    192       <SubType>UserControl</SubType>
    193     </Compile>
    194     <Compile Include="HistogramView.Designer.cs">
    195       <DependentUpon>HistogramView.cs</DependentUpon>
    196     </Compile>
    197     <Compile Include="LineChartView.cs">
    198       <SubType>UserControl</SubType>
    199     </Compile>
    200     <Compile Include="LineChartView.Designer.cs">
    201       <DependentUpon>LineChartView.cs</DependentUpon>
    202     </Compile>
    203     <Compile Include="ManipulationView.cs">
    204       <SubType>UserControl</SubType>
    205     </Compile>
    206     <Compile Include="ManipulationView.Designer.cs">
    207       <DependentUpon>ManipulationView.cs</DependentUpon>
    208     </Compile>
    209     <Compile Include="Plugin.cs" />
    210     <Compile Include="PreprocessingCheckedVariablesView.cs">
    211       <SubType>UserControl</SubType>
    212     </Compile>
    213     <Compile Include="PreprocessingCheckedVariablesView.Designer.cs">
    214       <DependentUpon>PreprocessingCheckedVariablesView.cs</DependentUpon>
    215201    </Compile>
    216202    <Compile Include="PreprocessingCheckedItemListView.cs">

  • branches/symbreg-factors-2650/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingChartView.cs

    r14401 r14421  
    6161        InitData();
    6262        GenerateChart();
     63
     64        foreach (var row in dataRows) {
     65          string variableName = row.Name;
     66          if (!IsVariableChecked(variableName)) {
     67            dataTableView.SetRowEnabled(variableName, false);
     68            dataTable.SelectedRows.Remove(variableName);
     69            dataTablePerVariable.Remove(dataTablePerVariable.Find(x => (x.Name == variableName)));
     70          }
     71        }
    6372      }
    6473    }
    … …  
    7180
    7281      //add data rows to data tables according to checked item list
    73       foreach (var checkedItem in Content.VariableItemList.CheckedItems) {
    74         string variableName = Content.VariableItemList[checkedItem.Index].Value;
     82      foreach (var row in dataRows) {
     83        string variableName = row.Name;
     84
     85        //add row to data table
     86        dataTable.Rows.Add(row);
     87
     88        //add row to data table per variable
    7589        PreprocessingDataTable d = new PreprocessingDataTable(variableName);
    76         DataRow row = GetDataRow(variableName);
    77 
    78         if (row != null) {
    79           //add row to data table
    80           dataTable.Rows.Add(row);
    81 
    82           //add row to data table per variable
    83           d.Rows.Add(row);
    84           dataTablePerVariable.Add(d);
    85         }
     90        d.Rows.Add(row);
     91        dataTablePerVariable.Add(d);
    8692      }
    8793
    … …  
    95101        string variableName = item.Value.Value;
    96102
    97         // not checked -> remove
     103
    98104        if (!IsVariableChecked(variableName)) {
     105          // not checked -> remove
    99106          dataTableView.SetRowEnabled(variableName, false);
    100107          dataTable.SelectedRows.Remove(variableName);
    101108          dataTablePerVariable.Remove(dataTablePerVariable.Find(x => (x.Name == variableName)));
    102109        } else {
     110          // checked -> add
    103111          DataRow row = GetDataRow(variableName);
    104112          DataRow selectedRow = GetSelectedDataRow(variableName);

  • branches/symbreg-factors-2650/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedVariablesView.cs

    r14401 r14421  
    5656
    5757      if (Content.VariableItemList == null) {
    58         Content.VariableItemList = Content.CreateVariableItemList();
     58        IList<string> inputs = Content.PreprocessingData.InputVariables;
     59        if (Content.PreprocessingData.TargetVariable != null)
     60          inputs = inputs.Union(new[] {Content.PreprocessingData.TargetVariable}).ToList();
     61        Content.VariableItemList = Content.CreateVariableItemList(inputs);
    5962      } else {
    6063        var checkedNames = Content.VariableItemList.CheckedItems.Select(x => x.Value.Value);
    61         Content.VariableItemList = Content.CreateVariableItemList(checkedNames);
     64        Content.VariableItemList = Content.CreateVariableItemList(checkedNames.ToList());
    6265      }
    6366      Content.VariableItemList.CheckedItemsChanged += CheckedItemsChanged;
Note: See TracChangeset for help on using the changeset viewer.