Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/14/16 17:51:48 (8 years ago)
Author:
pfleck
Message:

#2559

  • Enabled type selection for creating/importing/exporting/applying.
  • Deleted unnecessary interfaces.
  • Reorganized source files of DataPreprocessing.
Location:
trunk/sources/HeuristicLab.DataPreprocessing/3.4/Content
Files:
1 added
15 copied

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.DataPreprocessing/3.4/Content/CorrelationMatrixContent.cs

    r13507 r13508  
    2121
    2222using System.Drawing;
    23 using System.Linq;
    2423using HeuristicLab.Common;
    2524using HeuristicLab.Core;
    … …  
    4039    public DataAnalysisProblemData ProblemData {
    4140      get {
    42         // ToDo: avoid iterating
    43         return Context.ExportPossibilities.Select(p => p.Value()).OfType<DataAnalysisProblemData>().Single();
     41        return (DataAnalysisProblemData)Context.CreateNewProblemData();
    4442        //var creator = new ProblemDataCreator(Context);
    4543        //return (DataAnalysisProblemData)creator.CreateProblemData();

  • trunk/sources/HeuristicLab.DataPreprocessing/3.4/Content/DataCompletenessChartContent.cs

    r13507 r13508  
    1111    }
    1212
    13     public IDataGridLogic DataGridLogic { get; private set; }
    14     public ISearchLogic SearchLogic { get; private set; }
     13    //public DataGridLogic DataGridLogic { get; private set; }
     14    public SearchLogic SearchLogic { get; private set; }
    1515
    1616    public DataCompletenessChartContent(SearchLogic searchLogic) {

  • trunk/sources/HeuristicLab.DataPreprocessing/3.4/Content/DataGridContent.cs

    r13507 r13508  
    3838    }
    3939
    40     public IManipulationLogic ManipulationLogic { get; private set; }
    41     public IFilterLogic FilterLogic { get; private set; }
     40    public ManipulationLogic ManipulationLogic { get; private set; }
     41    public FilterLogic FilterLogic { get; private set; }
    4242
    4343    public int Rows {
    … …  
    9797
    9898
    99     public DataGridContent(ITransactionalPreprocessingData preProcessingData, IManipulationLogic theManipulationLogic, IFilterLogic theFilterLogic) {
     99    public DataGridContent(ITransactionalPreprocessingData preProcessingData, ManipulationLogic theManipulationLogic, FilterLogic theFilterLogic) {
    100100      ManipulationLogic = theManipulationLogic;
    101101      FilterLogic = theFilterLogic;

  • trunk/sources/HeuristicLab.DataPreprocessing/3.4/Content/FilterContent.cs

    r13507 r13508  
    3535    private ICheckedItemCollection<IFilter> filters = new CheckedItemCollection<IFilter>();
    3636
    37     public IFilterLogic FilterLogic { get; private set; }
     37    public FilterLogic FilterLogic { get; private set; }
    3838
    3939    public ICheckedItemCollection<IFilter> Filters {
    … …  
    5656    }
    5757
    58     public FilterContent(IFilterLogic filterLogic) {
     58    public FilterContent(FilterLogic filterLogic) {
    5959      FilterLogic = filterLogic;
    6060    }

  • trunk/sources/HeuristicLab.DataPreprocessing/3.4/Content/IDataGridContent.cs

    r13507 r13508  
    2626  public interface IDataGridContent : IStringConvertibleMatrix {
    2727    ITransactionalPreprocessingData PreProcessingData { get; }
    28     IManipulationLogic ManipulationLogic { get; }
    29     IFilterLogic FilterLogic { get; }
     28    ManipulationLogic ManipulationLogic { get; }
     29    FilterLogic FilterLogic { get; }
    3030
    3131    IDictionary<int, IList<int>> Selection { get; set; }

  • trunk/sources/HeuristicLab.DataPreprocessing/3.4/Content/ManipulationContent.cs

    r13507 r13508  
    2929  public class ManipulationContent : Item, IViewShortcut {
    3030
    31     private IManipulationLogic manipulationLogic;
    32     private ISearchLogic searchLogic;
    33     private IFilterLogic filterLogic;
     31    private ManipulationLogic manipulationLogic;
     32    private SearchLogic searchLogic;
     33    private FilterLogic filterLogic;
    3434
    35     public IManipulationLogic ManipulationLogic { get { return manipulationLogic; } }
    36     public ISearchLogic SearchLogic { get { return searchLogic; } }
    37     public IFilterLogic FilterLogic { get { return filterLogic; } }
     35    public ManipulationLogic ManipulationLogic { get { return manipulationLogic; } }
     36    public SearchLogic SearchLogic { get { return searchLogic; } }
     37    public FilterLogic FilterLogic { get { return filterLogic; } }
    3838
    3939    public static new Image StaticItemImage {
    … …  
    4141    }
    4242
    43     public ManipulationContent(IManipulationLogic theManipulationLogic, ISearchLogic theSearchLogic, IFilterLogic theFilterLogic) {
     43    public ManipulationContent(ManipulationLogic theManipulationLogic, SearchLogic theSearchLogic, FilterLogic theFilterLogic) {
    4444      manipulationLogic = theManipulationLogic;
    4545      searchLogic = theSearchLogic;

  • trunk/sources/HeuristicLab.DataPreprocessing/3.4/Content/StatisticsContent.cs

    r13507 r13508  
    2828  public class StatisticsContent : Item, IViewShortcut {
    2929
    30     private readonly IStatisticsLogic statisticsLogic;
    31     public StatisticsContent(IStatisticsLogic theStatisticsLogic) {
     30    private readonly StatisticsLogic statisticsLogic;
     31    public StatisticsContent(StatisticsLogic theStatisticsLogic) {
    3232      statisticsLogic = theStatisticsLogic;
    3333    }
    … …  
    3838    }
    3939
    40     public IStatisticsLogic StatisticsLogic {
     40    public StatisticsLogic StatisticsLogic {
    4141      get { return statisticsLogic; }
    4242    }

  • trunk/sources/HeuristicLab.DataPreprocessing/3.4/Content/TransformationContent.cs

    r13507 r13508  
    3030
    3131    public IPreprocessingData Data { get; private set; }
    32     public IFilterLogic FilterLogic { get; private set; }
     32    public FilterLogic FilterLogic { get; private set; }
    3333
    3434    public ICheckedItemList<ITransformation> CheckedTransformationList { get; private set; }
    … …  
    3838    }
    3939
    40     public TransformationContent(IPreprocessingData data, IFilterLogic filterLogic) {
     40    public TransformationContent(IPreprocessingData data, FilterLogic filterLogic) {
    4141      Data = data;
    4242      CheckedTransformationList = new CheckedItemList<ITransformation>();
Note: See TracChangeset for help on using the changeset viewer.