- Timestamp:
- 03/19/14 12:05:50 (10 years ago)
- Location:
- branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3
- Files:
-
- 2 added
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/HeuristicLab.DataPreprocessing-3.3.csproj
r10586 r10614 78 78 <Compile Include="Implementations\ManipulationLogic.cs" /> 79 79 <Compile Include="Interfaces\IPreprocessingData.cs" /> 80 <Compile Include="Implementations\ViewShortcutCollection.cs" /> 80 81 <Compile Include="Interfaces\IDataGridLogic.cs" /> 81 82 <Compile Include="Implementations\FilterContent.cs" /> … … 93 94 <Compile Include="Interfaces\IManipulationLogic.cs" /> 94 95 <Compile Include="Interfaces\ITransformationLogic.cs" /> 96 <Compile Include="Interfaces\IViewShortcut.cs" /> 95 97 <Compile Include="ProblemDataCreator.cs" /> 96 98 <None Include="Plugin.cs.frame" /> -
branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/DataGridContent.cs
r10571 r10614 29 29 30 30 [Item("DataGrid", "Represents a data grid.")] 31 public class DataGridContent : Item, I DataGridContent {31 public class DataGridContent : Item, IViewShortcut, IDataGridContent { 32 32 33 33 private readonly IDataGridLogic dataGridLogic; 34 34 private readonly IManipulationLogic preprocessingDataManipulation; 35 35 36 public DataGridContent(IDataGridLogic theDataGridLogic, IManipulationLogic thePreprocessingDataManipulation) { 36 37 dataGridLogic = theDataGridLogic; -
branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/FilterContent.cs
r10539 r10614 26 26 namespace HeuristicLab.DataPreprocessing { 27 27 [Item("Filter", "Represents the filter grid.")] 28 public class FilterContent : Item {28 public class FilterContent : Item, IViewShortcut { 29 29 30 30 public static new Image StaticItemImage { -
branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/HistogramContent.cs
r10558 r10614 26 26 namespace HeuristicLab.DataPreprocessing { 27 27 [Item("Histogram", "Represents the histogram grid.")] 28 public class HistogramContent : Item {28 public class HistogramContent : Item, IViewShortcut { 29 29 30 30 private readonly IHistogramLogic histogramLogic; -
branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/LineChartContent.cs
r10573 r10614 26 26 namespace HeuristicLab.DataPreprocessing { 27 27 [Item("LineChart", "Represents the line chart grid.")] 28 public class LineChartContent : Item {28 public class LineChartContent : Item, IViewShortcut { 29 29 30 30 private readonly ILineChartLogic lineChartLogic; -
branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/PreprocessingContext.cs
r10586 r10614 31 31 : Item, IPreprocessingContext { 32 32 33 public ITransactionalPreprocessingData Data { get; private set; } 34 35 public ViewShortcutCollection ViewShortcuts { get; private set; } 36 37 public IDataAnalysisProblemData DataAnalysisProblemData { get; private set; } 38 39 public IAlgorithm Algorithm { get; private set; } 40 41 public IDataAnalysisProblem Problem { get; private set; } 42 33 43 public PreprocessingContext(IDataAnalysisProblemData dataAnalysisProblemData, IAlgorithm algorithm, IDataAnalysisProblem problem) { 34 44 Data = new TransactionalPreprocessingData(dataAnalysisProblemData); … … 36 46 Algorithm = algorithm; 37 47 Problem = problem; 48 49 var searchLogic = new SearchLogic(Data); 50 var dataGridLogic = new DataGridLogic(Data); 51 var statisticsLogic = new StatisticsLogic(Data, searchLogic); 52 var manipulationLogic = new ManipulationLogic(Data, searchLogic, statisticsLogic); 53 var transformationLogic = new TransformationLogic(Data, searchLogic, statisticsLogic); 54 var lineChartLogic = new LineChartLogic(Data); 55 var histogramLogic = new HistogramLogic(Data); 56 var filterLogic = new FilterLogic(); 57 58 ViewShortcuts = new ViewShortcutCollection { 59 new DataGridContent(dataGridLogic, manipulationLogic), 60 new StatisticsContent(statisticsLogic), 61 new FilterContent(filterLogic), 62 new TransformationContent(transformationLogic), 63 new LineChartContent(lineChartLogic), 64 new HistogramContent(histogramLogic) 65 }; 38 66 } 39 67 … … 45 73 Problem = original.Problem; 46 74 } 47 48 public ITransactionalPreprocessingData Data { get; private set; }49 50 public IDataAnalysisProblemData DataAnalysisProblemData { get; private set; }51 52 public IAlgorithm Algorithm { get; private set; }53 54 public IDataAnalysisProblem Problem { get; private set; }55 75 56 76 public override IDeepCloneable Clone(Cloner cloner) { … … 65 85 } 66 86 } 67 68 87 public IProblem ExportProblem() { 69 88 return Export(Problem, SetupProblem); 89 } 90 public IAlgorithm ExportAlgorithm() { 91 return Export(Algorithm, SetupAlgorithm); 70 92 } 71 93 … … 73 95 return (IDataAnalysisProblem)problem; 74 96 } 75 76 public IAlgorithm ExportAlgorithm() {77 return Export(Algorithm, SetupAlgorithm);78 }79 80 97 private IDataAnalysisProblem SetupAlgorithm(IAlgorithm algorithm) { 81 98 algorithm.Name = algorithm.Name + "(Preprocessed)"; 82 99 algorithm.Runs.Clear(); 83 84 100 return (IDataAnalysisProblem)algorithm.Problem; 85 101 } 86 87 102 private T Export<T>(T original, Func<T, IDataAnalysisProblem> setup) 88 103 where T : IItem { -
branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/StatisticsContent.cs
r10551 r10614 25 25 namespace HeuristicLab.DataPreprocessing { 26 26 [Item("Statistics", "Represents the statistics grid.")] 27 public class StatisticsContent : Item {27 public class StatisticsContent : Item, IViewShortcut { 28 28 29 29 private readonly IStatisticsLogic statisticsLogic; -
branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/TransformationContent.cs
r10539 r10614 26 26 namespace HeuristicLab.DataPreprocessing { 27 27 [Item("Transformation", "Represents the transformation grid.")] 28 public class TransformationContent : Item {28 public class TransformationContent : Item, IViewShortcut { 29 29 30 30 private readonly ITransformationLogic transformationLogic; -
branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Interfaces/IPreprocessingContext.cs
r10586 r10614 31 31 ITransactionalPreprocessingData Data { get; } 32 32 33 ViewShortcutCollection ViewShortcuts { get; } 34 33 35 [Obsolete] 34 36 IDataAnalysisProblemData DataAnalysisProblemData { get; }
Note: See TracChangeset
for help on using the changeset viewer.