Changeset 10940

Timestamp:

06/04/14 13:22:03 (11 years ago)

Author:

tsteinre

Message:

• fixed CopyColumnTransformation inheritance
• created a non-generic version of Transformation

Location:

branches/DataPreprocessing

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TransformationToSymbolicTreeMapper.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Transformations/3.4/CopyColumnTransformation.cs (modified) (4 diffs)
• HeuristicLab.Problems.DataAnalysis.Transformations/3.4/Transformation.cs (modified) (2 diffs)

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TransformationToSymbolicTreeMapper.cs

@@ -46 +46 @@
       } else if (transformation is ShiftStandardDistributionTransformation) {
         return GenerateModelForShiftStandardDistributionTransformation();
+      } else if (transformation is CopyColumnTransformation) {
+        // TODO
       }
       throw new NotImplementedException();

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Transformations/3.4/CopyColumnTransformation.cs

@@ -30 +30 @@
 namespace HeuristicLab.Problems.DataAnalysis.Transformations {
   [Item("CopyColumnTransformation", "Represents a transformation which represents a copied Column.")]
-  public class CopyColumnTransformation<T> : Transformation<T> {
+  public class CopyColumnTransformation : Transformation {
     protected const string CopiedColumnNameParameterName = "CopiedColumnName";
 
@@ -40 +40 @@
 
     #region properties
+    public override string ShortName {
+      get { return "Cpy"; }
+    }
     public string CopiedColumnName {
       get { return CopiedColumnNameParameter.Value.Value; }
@@ -47 +50 @@
     [StorableConstructor]
     protected CopyColumnTransformation(bool deserializing) : base(deserializing) { }
-    protected CopyColumnTransformation(CopyColumnTransformation<T> original, Cloner cloner)
+    protected CopyColumnTransformation(CopyColumnTransformation original, Cloner cloner)
       : base(original, cloner) {
     }
@@ -56 +59 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new CopyColumnTransformation<T>(this, cloner);
-    }
-
-    public override IEnumerable<T> Apply(IEnumerable<T> data) {
-      foreach (T a in data) {
-        yield return a;
-      }
-    }
-
-    public override bool Check(IEnumerable<T> data, out string errorMsg) {
-      errorMsg = "";
-      return true;
+      return new CopyColumnTransformation(this, cloner);
     }
   }

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Transformations/3.4/Transformation.cs

@@ -29 +29 @@
 
 namespace HeuristicLab.Problems.DataAnalysis.Transformations {
+
   [Item("Transformation", "Represents the base class for a transformation.")]
   [StorableClass]
-  public abstract class Transformation<T> : ParameterizedNamedItem, ITransformation<T> {
+  public abstract class Transformation : ParameterizedNamedItem, ITransformation {
     protected const string ColumnParameterName = "Column";
     #region parameter properties
@@ -49 +50 @@
     [StorableConstructor]
     protected Transformation(bool deserializing) : base(deserializing) { }
-    protected Transformation(Transformation<T> original, Cloner cloner) : base(original, cloner) { }
+    protected Transformation(Transformation original, Cloner cloner) : base(original, cloner) { }
     protected Transformation(IEnumerable<string> allowedColumns) {
       var allowed = new ItemSet<StringValue>(allowedColumns.Select(e => new StringValue(e)));
       Parameters.Add(new ConstrainedValueParameter<StringValue>(ColumnParameterName, "Column used for the Transformation", allowed));
     }
+  }
+
+  [Item("Transformation", "Represents the base class for a transformation.")]
+  [StorableClass]
+  public abstract class Transformation<T> : Transformation, ITransformation<T> {
+
+    [StorableConstructor]
+    protected Transformation(bool deserializing) : base(deserializing) { }
+    protected Transformation(Transformation<T> original, Cloner cloner) : base(original, cloner) { }
+    protected Transformation(IEnumerable<string> allowedColumns):base(allowedColumns) { }
 
     public abstract IEnumerable<T> Apply(IEnumerable<T> data);
 
     public abstract bool Check(IEnumerable<T> data, out string errorMsg);
-
-    #region IParameterizedItem Members
-
-    public new IKeyedItemCollection<string, IParameter> Parameters {
-      get { throw new System.NotImplementedException(); }
-    }
-
-    #endregion
   }
 }