Context Navigation

← Previous Change
Next Change →

HeuristicLab.Problems.DataAnalysis

Timestamp:

07/01/14 15:49:31 (10 years ago)

Author:

mkommend

Message:

#2206: Removed seperate plugin for transformations and integrated them in HeuristicLab.Problems.DataAnalysis.

Location:

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis/3.4

Files:

: 1 added
: 9 edited
: 10 copied

HeuristicLab.Problems.DataAnalysis-3.4.csproj (modified) (3 diffs)
Implementation/Classification/ClassificationProblemData.cs (modified) (1 diff)
Implementation/Clustering/ClusteringProblemData.cs (modified) (1 diff)
Implementation/DataAnalysisProblemData.cs (modified) (2 diffs)
Implementation/Regression/RegressionProblemData.cs (modified) (1 diff)
Implementation/Transformations (added)
Implementation/Transformations/CopyColumnTransformation.cs (copied) (copied from branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Transformations/3.4/CopyColumnTransformation.cs) (1 diff)
Implementation/Transformations/ExponentialTransformation.cs (copied) (copied from branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Transformations/3.4/ExponentialTransformation.cs) (1 diff)
Implementation/Transformations/LinearTransformation.cs (copied) (copied from branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Transformations/3.4/LinearTransformation.cs) (1 diff)
Implementation/Transformations/LogarithmicTransformation.cs (copied) (copied from branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Transformations/3.4/LogarithmicTransformation.cs) (1 diff)
Implementation/Transformations/PowerTransformation.cs (copied) (copied from branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Transformations/3.4/PowerTransformation.cs) (1 diff)
Implementation/Transformations/ReciprocalTransformation.cs (copied) (copied from branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Transformations/3.4/ReciprocalTransformation.cs) (1 diff)
Implementation/Transformations/ShiftStandardDistributionTransformation.cs (copied) (copied from branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Transformations/3.4/ShiftStandardDistributionTransformation.cs) (1 diff)
Implementation/Transformations/ShiftToRangeTransformation.cs (copied) (copied from branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Transformations/3.4/ShiftToRangeTransformation.cs) (1 diff)
Implementation/Transformations/Transformation.cs (copied) (copied from branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Transformations/3.4/Transformation.cs) (2 diffs)
Interfaces/IDataAnalysisProblemData.cs (modified) (1 diff)
Interfaces/IModelBacktransformator.cs (modified) (1 diff)
Interfaces/ITransformation.cs (copied) (copied from branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Transformations/3.4/Interfaces/ITransformation.cs) (1 diff)
Interfaces/ITransformationMapper.cs (modified) (1 diff)
Plugin.cs.frame (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj

-                      r10925
+                      r11068
     <Compile Include="Implementation\TimeSeriesPrognosis\TimeSeriesPrognosisSolution.cs" />
     <Compile Include="Implementation\TimeSeriesPrognosis\TimeSeriesPrognosisSolutionBase.cs" />
+    <Compile Include="Implementation\Transformations\CopyColumnTransformation.cs" />
+    <Compile Include="Implementation\Transformations\ExponentialTransformation.cs" />
+    <Compile Include="Implementation\Transformations\LinearTransformation.cs" />
+    <Compile Include="Implementation\Transformations\LogarithmicTransformation.cs" />
+    <Compile Include="Implementation\Transformations\PowerTransformation.cs" />
+    <Compile Include="Implementation\Transformations\ReciprocalTransformation.cs" />
+    <Compile Include="Implementation\Transformations\ShiftStandardDistributionTransformation.cs" />
+    <Compile Include="Implementation\Transformations\ShiftToRangeTransformation.cs" />
+    <Compile Include="Implementation\Transformations\Transformation.cs" />
     <Compile Include="Interfaces\Classification\IClassificationEnsembleModel.cs">
       <SubType>Code</SubType>
 …
     <Compile Include="Interfaces\IDependencyCalculator.cs" />
     <Compile Include="Interfaces\IModelBacktransformator.cs" />
+    <Compile Include="Interfaces\ITransformation.cs" />
     <Compile Include="Interfaces\ITransformationMapper.cs" />
     <Compile Include="Interfaces\Regression\IRegressionEnsembleModel.cs">
 …
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Transformations\3.4\HeuristicLab.Problems.DataAnalysis.Transformations-3.4.csproj">
-      <Project>{2e257a94-d1af-435c-99b4-5ac00eadfd6a}</Project>
-      <Name>HeuristicLab.Problems.DataAnalysis.Transformations-3.4</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
       <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblemData.cs

r11009	r11068
28	28	using HeuristicLab.Parameters;
29	29	using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
30		~~using HeuristicLab.Problems.DataAnalysis.Transformations;~~
31	30
32	31	namespace HeuristicLab.Problems.DataAnalysis {

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Clustering/ClusteringProblemData.cs

r10922	r11068
24	24	using HeuristicLab.Core;
25	25	using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
26		~~using HeuristicLab.Problems.DataAnalysis.Transformations;~~
27	26
28	27	namespace HeuristicLab.Problems.DataAnalysis {

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisProblemData.cs

-                      r11009
+                      r11068
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Problems.DataAnalysis.Transformations;
 namespace HeuristicLab.Problems.DataAnalysis {
 …
+    }
     protected DataAnalysisProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables, IList<ITransformation> transformations) {
+    protected DataAnalysisProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables, IEnumerable<ITransformation> transformations) {
       if (dataset == null) throw new ArgumentNullException("The dataset must not be null.");
       if (allowedInputVariables == null) throw new ArgumentNullException("The allowedInputVariables must not be null.");

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs

r11009	r11068
28	28	using HeuristicLab.Parameters;
29	29	using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
30		~~using HeuristicLab.Problems.DataAnalysis.Transformations;~~
31	30
32	31	namespace HeuristicLab.Problems.DataAnalysis {

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

r11063	r11068
28	28	using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
29	29
30		namespace HeuristicLab.Problems.DataAnalysis~~.Transformations~~ {
	30	namespace HeuristicLab.Problems.DataAnalysis {
31	31	[Item("CopyColumnTransformation", "Represents a transformation which represents a copied Column.")]
32	32	public class CopyColumnTransformation : Transformation {

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/ExponentialTransformation.cs

r11063	r11068
7	7	using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
8	8
9		namespace HeuristicLab.Problems.DataAnalysis~~.Transformations~~ {
	9	namespace HeuristicLab.Problems.DataAnalysis {
10	10	[Item("Exponential Transformation", "f(x) = b ^ x \| Represents a exponential transformation.")]
11	11	public class ExponentialTransformation : Transformation<double> {

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/LinearTransformation.cs

r11063	r11068
30	30	using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
31	31
32		namespace HeuristicLab.Problems.DataAnalysis~~.Transformations~~ {
	32	namespace HeuristicLab.Problems.DataAnalysis {
33	33	[Item("Linear Transformation", "f(x) = k * x + d \| Represents a linear transformation with multiplication and addition.")]
34	34	public class LinearTransformation : Transformation<double> {

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/LogarithmicTransformation.cs

r11063	r11068
8	8	using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
9	9
10		namespace HeuristicLab.Problems.DataAnalysis~~.Transformations~~ {
	10	namespace HeuristicLab.Problems.DataAnalysis {
11	11	[Item("Logarithmic Transformation", "f(x) = log(x, b) \| Represents a logarithmic transformation.")]
12	12	public class LogarithmicTransformation : Transformation<double> {

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/PowerTransformation.cs

r11063	r11068
7	7	using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
8	8
9		namespace HeuristicLab.Problems.DataAnalysis~~.Transformations~~ {
	9	namespace HeuristicLab.Problems.DataAnalysis {
10	10	[Item("Power Transformation", "f(x) = x ^ exp \| Represents a power transformation.")]
11	11	public class PowerTransformation : Transformation<double> {

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/ReciprocalTransformation.cs

r11063	r11068
6	6	using HeuristicLab.Core;
7	7	using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
8		namespace HeuristicLab.Problems.DataAnalysis~~.Transformations~~ {
	8	namespace HeuristicLab.Problems.DataAnalysis {
9	9	[Item("Reciprocal Transformation", "f(x) = 1 / x \| Represents a reciprocal transformation.")]
10	10	public class ReciprocalTransformation : Transformation<double> {

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/ShiftStandardDistributionTransformation.cs

r11063	r11068
7	7	using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
8	8
9		namespace HeuristicLab.Problems.DataAnalysis~~.Transformations~~ {
	9	namespace HeuristicLab.Problems.DataAnalysis {
10	10	[Item("Shift Standard Distribution Transformation", "f(x) = ((x - m_org) / s_org ) * s_tar + m_tar \| Represents Transformation to unit standard deviation and additional linear transformation to a target Mean and Standard deviation")]
11	11	public class ShiftStandardDistributionTransformation : Transformation<double> {

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/ShiftToRangeTransformation.cs

r11063	r11068
7	7	using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
8	8
9		namespace HeuristicLab.Problems.DataAnalysis~~.Transformations~~ {
	9	namespace HeuristicLab.Problems.DataAnalysis {
10	10	[Item("Shift to Range Transformation", "f(x) = k * x + d, start <= f(x) <= end \| Represents a linear Transformation using Parameters defining a target range")]
11	11	public class ShiftToRangeTransformation : LinearTransformation {

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

-                      r11063
+                      r11068
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 namespace HeuristicLab.Problems.DataAnalysis.Transformations {
+namespace HeuristicLab.Problems.DataAnalysis {
   [Item("Transformation", "Represents the base class for a transformation.")]
 …
     protected Transformation(bool deserializing) : base(deserializing) { }
     protected Transformation(Transformation<T> original, Cloner cloner) : base(original, cloner) { }
     protected Transformation(IEnumerable<string> allowedColumns):base(allowedColumns) { }
+    protected Transformation(IEnumerable<string> allowedColumns) : base(allowedColumns) { }
     public abstract IEnumerable<T> Apply(IEnumerable<T> data);

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IDataAnalysisProblemData.cs

r11009	r11068
24	24	using HeuristicLab.Core;
25	25	using HeuristicLab.Data;
26		~~using HeuristicLab.Problems.DataAnalysis.Transformations;~~
27	26
28	27	namespace HeuristicLab.Problems.DataAnalysis {

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IModelBacktransformator.cs

r11011	r11068
21	21
22	22	using System.Collections.Generic;
23		using HeuristicLab.Problems.DataAnalysis.Transformations;
	23
24	24
25	25	namespace HeuristicLab.Problems.DataAnalysis {

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/ITransformation.cs

r11063	r11068
23	23	using HeuristicLab.Core;
24	24
25		namespace HeuristicLab.Problems.DataAnalysis~~.Transformations~~ {
	25	namespace HeuristicLab.Problems.DataAnalysis {
26	26	public interface ITransformation : IParameterizedItem {
27	27	string ShortName { get; }

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/ITransformationMapper.cs

r10854	r11068
20	20	#endregion
21	21
22		~~using HeuristicLab.Problems.DataAnalysis.Transformations;~~
23	22
24	23	namespace HeuristicLab.Problems.DataAnalysis {

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis/3.4/Plugin.cs.frame

-                      r10925
+                      r11068
   [PluginDependency("HeuristicLab.Parameters", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]
+  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
+  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Transformations", "3.4")]
+  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
   public class HeuristicLabProblemsDataAnalysisPlugin : PluginBase {
+  }

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 11068 for branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis

Legend:

Download in other formats: