Changeset 10772 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing

Timestamp:

04/23/14 12:38:07 (11 years ago)

Author:

pfleck

Message:

• Current Transformations from GUI stored in TransformationContent.
• Corrected namespace from Transformation interfaces.

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Files:

• Implementations/PreprocessingData.cs (modified) (1 diff)
• Implementations/TransformationContent.cs (modified) (2 diffs)
• Interfaces/IPreprocessingData.cs (modified) (1 diff)
• ProblemDataCreator.cs (modified) (2 diffs)
• Properties/AssemblyInfo.cs.frame (modified) (1 diff)

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

@@ -28 +28 @@
 using HeuristicLab.Data;
 using HeuristicLab.Problems.DataAnalysis;
+using HeuristicLab.Problems.DataAnalysis.Transformations;
 
 namespace HeuristicLab.DataPreprocessing {

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

@@ -23 +23 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Problems.DataAnalysis;
+using HeuristicLab.Problems.DataAnalysis.Transformations;
 
 namespace HeuristicLab.DataPreprocessing {
@@ -28 +30 @@
   public class TransformationContent : Item, IViewShortcut {
 
-    private readonly ITransformationLogic transformationLogic;
-    public TransformationContent(ITransformationLogic theTransformationLogic) {
-      transformationLogic = theTransformationLogic;
+    public IPreprocessingData Data { get; private set; }
+
+    public ICheckedItemCollection<ITransformation> CheckedTransformationCollection { get; private set; }
+
+    public TransformationContent(IPreprocessingData data) {
+      Data = data;
+      CheckedTransformationCollection = new CheckedItemCollection<ITransformation>();
     }
 
-    public ITransformationLogic TransformationLogic {
-      get {
-        return transformationLogic;
-      }
-    }
-
-    public TransformationContent(TransformationContent content, Cloner cloner)
-      : base(content, cloner) {
-
+    public TransformationContent(TransformationContent original, Cloner cloner)
+      : base(original, cloner) {
+      Data = original.Data;
+      CheckedTransformationCollection = new CheckedItemCollection<ITransformation>(original.CheckedTransformationCollection);
     }
 

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

@@ -25 +25 @@
 using HeuristicLab.Data;
 using HeuristicLab.Problems.DataAnalysis;
+using HeuristicLab.Problems.DataAnalysis.Transformations;
 
 namespace HeuristicLab.DataPreprocessing {

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/ProblemDataCreator.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using HeuristicLab.Problems.DataAnalysis;
+using HeuristicLab.Problems.DataAnalysis.Transformations;
 
 namespace HeuristicLab.DataPreprocessing {
@@ -36 +37 @@
     private IEnumerable<string> InputVariables { get { return context.Data.VariableNames; } }
     private IEnumerable<ITransformation> Transformations { get { return context.Data.Transformations; } }
-
 
     public ProblemDataCreator(IPreprocessingContext context) {

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Properties/AssemblyInfo.cs.frame

@@ -32 +32 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.9.0")]
 [assembly: AssemblyFileVersion("3.3.9.$WCREV$")]