Changeset 11114 for trunk/sources/HeuristicLab.DataPreprocessing/3.4

Timestamp:

07/07/14 15:33:56 (9 years ago)

Author:

mkommend

Message:

#2206: Merged data preprocessing into the trunk.

Location:

trunk/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.DataPreprocessing (copied) (copied from branches/DataPreprocessing/HeuristicLab.DataPreprocessing)
• HeuristicLab.DataPreprocessing/3.4/HeuristicLab.DataPreprocessing-3.4.csproj (modified) (2 diffs)
• HeuristicLab.DataPreprocessing/3.4/Implementations/PreprocessingContext.cs (modified) (2 diffs)
• HeuristicLab.DataPreprocessing/3.4/Implementations/PreprocessingDataTable.cs (modified) (3 diffs)
• HeuristicLab.DataPreprocessing/3.4/Implementations/TransactionalPreprocessingData.cs (modified) (2 diffs)
• HeuristicLab.DataPreprocessing/3.4/Plugin.cs.frame (modified) (1 diff)

trunk/sources/HeuristicLab.DataPreprocessing/3.4/HeuristicLab.DataPreprocessing-3.4.csproj

@@ -149 +149 @@
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
-      <Project>{06d4a186-9319-48a0-bade-a2058d462eea}</Project>
-      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
       <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
@@ -159 +154 @@
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
-      <Project>{56f9106a-079f-4c61-92f6-86a84c2d84b7}</Project>
-      <Name>HeuristicLab.Parameters-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
-      <Project>{102bc7d3-0ef9-439c-8f6d-96ff0fdb8e1b}</Project>
-      <Name>HeuristicLab.Persistence-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
       <Project>{94186a6a-5176-4402-ae83-886557b53cca}</Project>
       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj">
-      <Project>{3d28463f-ec96-4d82-afee-38be91a0ca00}</Project>
-      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name>
       <Private>False</Private>
     </ProjectReference>

trunk/sources/HeuristicLab.DataPreprocessing/3.4/Implementations/PreprocessingContext.cs

@@ -20 +20 @@
 #endregion
 
-using System;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.DataPreprocessing.Implementations;
+using HeuristicLab.DataPreprocessing.Interfaces;
 using HeuristicLab.Optimization;
 using HeuristicLab.Problems.DataAnalysis;
-using HeuristicLab.DataPreprocessing.Implementations;
-using HeuristicLab.DataPreprocessing.Interfaces;
 
 namespace HeuristicLab.DataPreprocessing {
@@ -53 +52 @@
     }
 
-    private PreprocessingContext(PreprocessingContext original, Cloner cloner)
+    protected PreprocessingContext(PreprocessingContext original, Cloner cloner)
       : base(original, cloner) {
       Data = cloner.Clone(original.Data);

trunk/sources/HeuristicLab.DataPreprocessing/3.4/Implementations/PreprocessingDataTable.cs

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using HeuristicLab.Analysis;
-using HeuristicLab.Collections;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 
 namespace HeuristicLab.DataPreprocessing.Implementations {
-
   [Item("PreprossingDataTable", "A table of data values.")]
   public class PreprocessingDataTable : DataTable {
@@ -14 +10 @@
     public PreprocessingDataTable()
       : base() {
-        SelectedRows = new NamedItemCollection<DataRow>();
+      SelectedRows = new NamedItemCollection<DataRow>();
     }
     public PreprocessingDataTable(string name)
       : base(name) {
-        SelectedRows = new NamedItemCollection<DataRow>();
+      SelectedRows = new NamedItemCollection<DataRow>();
+    }
+
+    protected PreprocessingDataTable(PreprocessingDataTable original, Cloner cloner)
+      : base(original, cloner) {
+      this.selectedRows = cloner.Clone(original.selectedRows);
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new PreprocessingDataTable(this, cloner);
     }
 
@@ -27 +31 @@
         if (selectedRows != null) throw new InvalidOperationException("Rows already set");
         selectedRows = value;
-        //if (selectedRows != null) RegisterSelectedRowEvents();
       }
     }

trunk/sources/HeuristicLab.DataPreprocessing/3.4/Implementations/TransactionalPreprocessingData.cs

@@ -31 +31 @@
 
 namespace HeuristicLab.DataPreprocessing {
-
   [Item("PreprocessingData", "Represents data used for preprocessing.")]
   public class TransactionalPreprocessingData : PreprocessingData, ITransactionalPreprocessingData {
@@ -59 +58 @@
     }
 
-    private TransactionalPreprocessingData(TransactionalPreprocessingData original, Cloner cloner)
+    protected TransactionalPreprocessingData(TransactionalPreprocessingData original, Cloner cloner)
       : base(original, cloner) {
     }

trunk/sources/HeuristicLab.DataPreprocessing/3.4/Plugin.cs.frame

@@ -34 +34 @@
   [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")]
-  [PluginDependency("HeuristicLab.MainForm", "3.3")]
-  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")] 
   [PluginDependency("HeuristicLab.Problems.DataAnalysis","3.4")]
-  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Views","3.4")]
-  [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding", "3.4")]
-  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic", "3.4")]
-  [PluginDependency("HeuristicLab.Parameters","3.3")]
-  [PluginDependency("HeuristicLab.Persistence","3.3")] 
   public class HeuristicLabDataPreprocessingPlugin : PluginBase {
   }