Free cookie consent management tool by TermsFeed Policy Generator

Changeset 10667


Ignore:
Timestamp:
03/26/14 15:13:26 (11 years ago)
Author:
mleitner
Message:

Dont calculate filter preview when no constraintdata

Location:
branches/DataPreprocessing
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/HeuristicLab.DataPreprocessing.Views-3.3.csproj

    r10658 r10667  
    9191      <DependentUpon>FindAndReplaceDialog.cs</DependentUpon>
    9292    </Compile>
    93     <Compile Include="HistogramView.cs" />
     93    <Compile Include="HistogramView.cs">
     94      <SubType>UserControl</SubType>
     95    </Compile>
    9496    <Compile Include="HistogramView.Designer.cs">
    9597      <DependentUpon>HistogramView.cs</DependentUpon>
    9698    </Compile>
    97     <Compile Include="LineChartView.cs" />
     99    <Compile Include="LineChartView.cs">
     100      <SubType>UserControl</SubType>
     101    </Compile>
    98102    <Compile Include="LineChartView.Designer.cs">
    99103      <DependentUpon>LineChartView.cs</DependentUpon>
    100104    </Compile>
    101105    <Compile Include="Plugin.cs" />
    102     <Compile Include="PreprocessingChartView.cs" />
     106    <Compile Include="PreprocessingChartView.cs">
     107      <SubType>UserControl</SubType>
     108    </Compile>
    103109    <Compile Include="PreprocessingChartView.Designer.cs">
    104110      <DependentUpon>PreprocessingChartView.cs</DependentUpon>

  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/Filter/ComparisonFilter.cs

    r10620 r10667  
    105105
    106106
    107         public bool[] Check()
     107        public new bool[] Check()
    108108        {
    109109            bool[] result = new bool[ConstrainedValue.Rows];
    … …  
    134134        }
    135135
    136         public bool[] Check(out string errorMessage)
     136        public new bool[] Check(out string errorMessage)
    137137        {
    138138            errorMessage = string.Empty;

  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/Filter/IFilter.cs

    r10638 r10667  
    99  public interface IFilter : IConstraint
    1010  {
    11     bool[] Check();
    12     bool[] Check(out string errorMessage);
     11    new bool[] Check();
     12    new bool[] Check(out string errorMessage);
    1313  }
    1414}

  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/FilterLogic.cs

    r10666 r10667  
    4040       foreach (IFilter filter in filters)
    4141       {
     42            if (filter.ConstraintData == null) {
     43              continue;
     44            }
     45
    4246            bool[] filterResult = filter.Check();
    4347
Note: See TracChangeset for help on using the changeset viewer.