Changeset 10250 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Timestamp:

12/18/13 15:39:53 (11 years ago)

Author:

tsteinre

Message:

• created Interface IDataPreprocessorStarter for removing depedencies from Problems.DataAnalyis.Views to DataPreprocessing

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Files:

• HeuristicLab.DataPreprocessing-3.3.csproj (modified) (3 diffs)
• Implementations/PreprocessingContext.cs (modified) (1 diff)
• Plugin.cs.frame (modified) (2 diffs)

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

@@ -81 +81 @@
     <Compile Include="Interfaces\IPreprocessingDataManipulation.cs" />
     <Compile Include="Implementations\FilterContent.cs" />
+    <Compile Include="Implementations\DataPreprocessorStarter.cs" />
     <Compile Include="Implementations\FilterLogic.cs" />
     <Compile Include="Implementations\HistogramContent.cs" />
@@ -106 +107 @@
     <Compile Include="Implementations\SearchLogic.cs" />
     <Compile Include="Implementations\StatisticsLogic.cs" />
-    <Compile Include="Views\DataGridContentView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="Views\DataGridContentView.cs" />
     <Compile Include="Views\DataGridContentView.Designer.cs">
       <DependentUpon>DataGridContentView.cs</DependentUpon>
@@ -178 +177 @@
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Views\3.4\HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj">
+      <Project>{3e9e8944-44ff-40bb-a622-3a4a7dd0f198}</Project>
+      <Name>HeuristicLab.Problems.DataAnalysis.Views-3.4</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
       <Project>{df87c13e-a889-46ff-8153-66dcaa8c5674}</Project>

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

@@ -28 +28 @@
   [Item("PreprocessingContext", "PreprocessingContext")]
   public class PreprocessingContext : Item, IPreprocessingContext {
-    public PreprocessingContext(IPreprocessingData data, IItem parentItem, IDataAnalysisProblemData dataAnalysisProblemData, IAlgorithm algorithm) {
-      Data = data;
+    public PreprocessingContext(IDataAnalysisProblemData dataAnalysisProblemData, IItem parentItem, IAlgorithm algorithm) {
+      Data = new PreprocessingData(dataAnalysisProblemData);
       ParentItem = parentItem;
       DataAnalysisProblemData = dataAnalysisProblemData;

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Plugin.cs.frame

@@ -32 +32 @@
   [PluginDependency("HeuristicLab.Core", "3.3")]
   [PluginDependency("HeuristicLab.Collections", "3.3")]
+  [PluginDependency("HeuristicLab.Data","3.3")]
+  [PluginDependency("HeuristicLab.Data.Views","3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]
   [PluginDependency("HeuristicLab.Optimization", "3.3")]
@@ -37 +39 @@
   [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")] 
   [PluginDependency("HeuristicLab.Problems.DataAnalysis","3.4")]
+  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Views","3.4")]
   public class HeuristicLabDataPreprocessingPlugin : PluginBase {
   }