Changeset 14400 for trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4

Timestamp:

11/17/16 15:41:33 (8 years ago)

Author:

gkronber

Message:

#2697: reverse merge of r14378, r14390, r14391, r14393, r14394, r14396

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4

Files:

• DatasetExtensions.cs (modified) (1 diff)
• Implementation/DataAnalysisProblemData.cs (modified) (1 diff)
• Implementation/Transformations/LinearTransformation.cs (modified) (2 diffs)
• Implementation/Transformations/ShiftStandardDistributionTransformation.cs (modified) (2 diffs)
• Implementation/Transformations/ShiftToRangeTransformation.cs (modified) (2 diffs)
• Implementation/Transformations/Transformation.cs (modified) (1 diff)
• Interfaces/IDataAnalysisProblemData.cs (modified) (1 diff)
• Interfaces/ITransformation.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/DatasetExtensions.cs

@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
 
 namespace HeuristicLab.Problems.DataAnalysis {
   public static class DatasetExtensions {
-    public static double[,] ToArray(this IDataset dataset, IEnumerable<string> variables, IEnumerable<int> rows) {
-      return ToArray(dataset,
-        variables,
-        transformations: variables.Select(_ => (ITransformation<double>)null),  // no transform
-        rows: rows);
-    }
-    public static double[,] ToArray(this IDataset dataset, IEnumerable<string> variables, IEnumerable<ITransformation<double>> transformations, IEnumerable<int> rows) {
-      string[] variablesArr = variables.ToArray();
-      int[] rowsArr = rows.ToArray();
-      ITransformation<double>[] transformArr = transformations.ToArray();
-      if (transformArr.Length != variablesArr.Length)
-        throw new ArgumentException("Number of variables and number of transformations must match.");
-
-      double[,] matrix = new double[rowsArr.Length, variablesArr.Length];
-
-      for (int i = 0; i < variablesArr.Length; i++) {
-        var origValues = dataset.GetDoubleValues(variablesArr[i], rowsArr);
-        var values = transformArr[i] != null ? transformArr[i].Apply(origValues) : origValues;
-        int row = 0;
-        foreach (var value in values) {
-          matrix[row, i] = value;
-          row++;
-        }
+    public static IEnumerable<T> TakeEvery<T>(this IEnumerable<T> xs, int nth) {
+      int i = 0;
+      foreach (var x in xs) {
+        if (i % nth == 0) yield return x;
+        i++;
       }
-
-      return matrix;
     }
   }

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisProblemData.cs

@@ -73 +73 @@
     }
 
-    public double[,] AllowedInputsTrainingValues {
-      get { return Dataset.ToArray(AllowedInputVariables, TrainingIndices); }
-    }
-
-    public double[,] AllowedInputsTestValues { get { return Dataset.ToArray(AllowedInputVariables, TestIndices); } }
     public IntRange TrainingPartition {
       get { return TrainingPartitionParameter.Value; }

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/LinearTransformation.cs

@@ -52 +52 @@
     public double Multiplier {
       get { return MultiplierParameter.Value.Value; }
-      set {
+      protected set {
         MultiplierParameter.Value.Value = value;
       }
@@ -59 +59 @@
     public double Addend {
       get { return AddendParameter.Value.Value; }
-      set {
+      protected set {
         AddendParameter.Value.Value = value;
       }

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/ShiftStandardDistributionTransformation.cs

@@ -71 +71 @@
 
     public override IEnumerable<double> Apply(IEnumerable<double> data) {
+      ConfigureParameters(data);
       if (OriginalStandardDeviation.IsAlmost(0.0)) {
         return data;
@@ -93 +94 @@
     }
 
-    public override void ConfigureParameters(IEnumerable<double> data) {
+    protected void ConfigureParameters(IEnumerable<double> data) {
       OriginalStandardDeviation = data.StandardDeviation();
       OriginalMean = data.Average();

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/ShiftToRangeTransformation.cs

@@ -44 +44 @@
     }
 
+    public override IEnumerable<double> Apply(IEnumerable<double> data) {
+      ConfigureParameters(data);
+      return base.Apply(data);
+    }
+
     public override bool Check(IEnumerable<double> data, out string errorMsg) {
       ConfigureParameters(data);
@@ -49 +54 @@
     }
 
-    public override void ConfigureParameters(IEnumerable<double> data) {
+    protected void ConfigureParameters(IEnumerable<double> data) {
       double originalRangeStart = data.Min();
       double originalRangeEnd = data.Max();

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/Transformation.cs

@@ -66 +66 @@
     protected Transformation(IEnumerable<string> allowedColumns) : base(allowedColumns) { }
 
-    public virtual void ConfigureParameters(IEnumerable<T> data) {
-      // override in transformations with parameters
-    }
-
     public abstract IEnumerable<T> Apply(IEnumerable<T> data);
-    public IEnumerable<T> ConfigureAndApply(IEnumerable<T> data) {
-      ConfigureParameters(data);
-      return Apply(data);
-    }
 
     public abstract bool Check(IEnumerable<T> data, out string errorMsg);

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IDataAnalysisProblemData.cs

@@ -33 +33 @@
     IEnumerable<string> AllowedInputVariables { get; }
 
-    double[,] AllowedInputsTrainingValues { get; }
-    double[,] AllowedInputsTestValues { get; }
-
     IntRange TrainingPartition { get; }
     IntRange TestPartition { get; }

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/ITransformation.cs

@@ -30 +30 @@
 
   public interface ITransformation<T> : ITransformation {
-    void ConfigureParameters(IEnumerable<T> data);
-    IEnumerable<T> ConfigureAndApply(IEnumerable<T> data);
     IEnumerable<T> Apply(IEnumerable<T> data);
   }