Changeset 10614 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing

Timestamp:

03/19/14 12:05:50 (10 years ago)

Author:

pfleck

Message:

• replaced main menu list with ItemCollectionList
• added ViewShortcut interface for menu items

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Files:

• HeuristicLab.DataPreprocessing-3.3.csproj (modified) (2 diffs)
• Implementations/DataGridContent.cs (modified) (1 diff)
• Implementations/FilterContent.cs (modified) (1 diff)
• Implementations/HistogramContent.cs (modified) (1 diff)
• Implementations/LineChartContent.cs (modified) (1 diff)
• Implementations/PreprocessingContext.cs (modified) (5 diffs)
• Implementations/StatisticsContent.cs (modified) (1 diff)
• Implementations/TransformationContent.cs (modified) (1 diff)
• Implementations/ViewShortcutCollection.cs (added)
• Interfaces/IPreprocessingContext.cs (modified) (1 diff)
• Interfaces/IViewShortcut.cs (added)

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

@@ -78 +78 @@
     <Compile Include="Implementations\ManipulationLogic.cs" />
     <Compile Include="Interfaces\IPreprocessingData.cs" />
+    <Compile Include="Implementations\ViewShortcutCollection.cs" />
     <Compile Include="Interfaces\IDataGridLogic.cs" />
     <Compile Include="Implementations\FilterContent.cs" />
@@ -93 +94 @@
     <Compile Include="Interfaces\IManipulationLogic.cs" />
     <Compile Include="Interfaces\ITransformationLogic.cs" />
+    <Compile Include="Interfaces\IViewShortcut.cs" />
     <Compile Include="ProblemDataCreator.cs" />
     <None Include="Plugin.cs.frame" />

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/DataGridContent.cs

@@ -29 +29 @@
 
   [Item("DataGrid", "Represents a data grid.")]
-  public class DataGridContent : Item, IDataGridContent {
+  public class DataGridContent : Item, IViewShortcut, IDataGridContent {
 
     private readonly IDataGridLogic dataGridLogic;
     private readonly IManipulationLogic preprocessingDataManipulation;
+
     public DataGridContent(IDataGridLogic theDataGridLogic, IManipulationLogic thePreprocessingDataManipulation) {
       dataGridLogic = theDataGridLogic;

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/FilterContent.cs

@@ -26 +26 @@
 namespace HeuristicLab.DataPreprocessing {
   [Item("Filter", "Represents the filter grid.")]
-  public class FilterContent : Item {
+  public class FilterContent : Item, IViewShortcut {
 
     public static new Image StaticItemImage {

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/HistogramContent.cs

@@ -26 +26 @@
 namespace HeuristicLab.DataPreprocessing {
   [Item("Histogram", "Represents the histogram grid.")]
-  public class HistogramContent : Item {
+  public class HistogramContent : Item, IViewShortcut {
 
     private readonly IHistogramLogic histogramLogic;

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/LineChartContent.cs

@@ -26 +26 @@
 namespace HeuristicLab.DataPreprocessing {
   [Item("LineChart", "Represents the line chart grid.")]
-  public class LineChartContent : Item {
+  public class LineChartContent : Item, IViewShortcut {
 
     private readonly ILineChartLogic lineChartLogic;

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/PreprocessingContext.cs

@@ -31 +31 @@
     : Item, IPreprocessingContext {
 
+    public ITransactionalPreprocessingData Data { get; private set; }
+
+    public ViewShortcutCollection ViewShortcuts { get; private set; }
+
+    public IDataAnalysisProblemData DataAnalysisProblemData { get; private set; }
+
+    public IAlgorithm Algorithm { get; private set; }
+
+    public IDataAnalysisProblem Problem { get; private set; }
+
     public PreprocessingContext(IDataAnalysisProblemData dataAnalysisProblemData, IAlgorithm algorithm, IDataAnalysisProblem problem) {
       Data = new TransactionalPreprocessingData(dataAnalysisProblemData);
@@ -36 +46 @@
       Algorithm = algorithm;
       Problem = problem;
+
+      var searchLogic = new SearchLogic(Data);
+      var dataGridLogic = new DataGridLogic(Data);
+      var statisticsLogic = new StatisticsLogic(Data, searchLogic);
+      var manipulationLogic = new ManipulationLogic(Data, searchLogic, statisticsLogic);
+      var transformationLogic = new TransformationLogic(Data, searchLogic, statisticsLogic);
+      var lineChartLogic = new LineChartLogic(Data);
+      var histogramLogic = new HistogramLogic(Data);
+      var filterLogic = new FilterLogic();
+
+      ViewShortcuts = new ViewShortcutCollection {
+        new DataGridContent(dataGridLogic, manipulationLogic),
+        new StatisticsContent(statisticsLogic),
+        new FilterContent(filterLogic),
+        new TransformationContent(transformationLogic),
+        new LineChartContent(lineChartLogic),
+        new HistogramContent(histogramLogic)
+      };
     }
 
@@ -45 +73 @@
       Problem = original.Problem;
     }
-
-    public ITransactionalPreprocessingData Data { get; private set; }
-
-    public IDataAnalysisProblemData DataAnalysisProblemData { get; private set; }
-
-    public IAlgorithm Algorithm { get; private set; }
-
-    public IDataAnalysisProblem Problem { get; private set; }
 
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -65 +85 @@
       }
     }
-
     public IProblem ExportProblem() {
       return Export(Problem, SetupProblem);
+    }
+    public IAlgorithm ExportAlgorithm() {
+      return Export(Algorithm, SetupAlgorithm);
     }
 
@@ -73 +95 @@
       return (IDataAnalysisProblem)problem;
     }
-
-    public IAlgorithm ExportAlgorithm() {
-      return Export(Algorithm, SetupAlgorithm);
-    }
-
     private IDataAnalysisProblem SetupAlgorithm(IAlgorithm algorithm) {
       algorithm.Name = algorithm.Name + "(Preprocessed)";
       algorithm.Runs.Clear();
-
       return (IDataAnalysisProblem)algorithm.Problem;
     }
-
     private T Export<T>(T original, Func<T, IDataAnalysisProblem> setup)
         where T : IItem {

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/StatisticsContent.cs

@@ -25 +25 @@
 namespace HeuristicLab.DataPreprocessing {
   [Item("Statistics", "Represents the statistics grid.")]
-  public class StatisticsContent : Item {
+  public class StatisticsContent : Item, IViewShortcut {
 
     private readonly IStatisticsLogic statisticsLogic;

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/TransformationContent.cs

@@ -26 +26 @@
 namespace HeuristicLab.DataPreprocessing {
   [Item("Transformation", "Represents the transformation grid.")]
-  public class TransformationContent : Item {
+  public class TransformationContent : Item, IViewShortcut {
 
     private readonly ITransformationLogic transformationLogic;

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Interfaces/IPreprocessingContext.cs

@@ -31 +31 @@
     ITransactionalPreprocessingData Data { get; }
 
+    ViewShortcutCollection ViewShortcuts { get; }
+
     [Obsolete]
     IDataAnalysisProblemData DataAnalysisProblemData { get; }