Changeset 11068


Ignore:
Timestamp:
07/01/14 15:49:31 (8 years ago)
Author:
mkommend
Message:

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

Location:
branches/DataPreprocessing
Files:
1 added
37 edited
10 copied

Legend:

Unmodified
Added
Removed

  • branches/DataPreprocessing/HeuristicLab 3.3.sln

    r11009 r11068  
    11
    22Microsoft Visual Studio Solution File, Format Version 12.00
    3 # Visual Studio 2013
    4 VisualStudioVersion = 12.0.30501.0
    5 MinimumVisualStudioVersion = 10.0.40219.1
     3# Visual Studio 2012
    64Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{96396439-A764-4022-A8D2-BE021449B8D1}"
    75  ProjectSection(SolutionItems) = preProject
    … …  
    402400EndProject
    403401Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.DataPreprocessing.Views-3.4", "HeuristicLab.DataPreprocessing.Views\3.4\HeuristicLab.DataPreprocessing.Views-3.4.csproj", "{3FC7515E-D8A0-41FE-8CFA-50E3ADA61A1E}"
    404 EndProject
    405 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.DataAnalysis.Transformations-3.4", "HeuristicLab.Problems.DataAnalysis.Transformations\3.4\HeuristicLab.Problems.DataAnalysis.Transformations-3.4.csproj", "{2E257A94-D1AF-435C-99B4-5AC00EADFD6A}"
    406402EndProject
    407403Global
    … …  
    19591955    {3FC7515E-D8A0-41FE-8CFA-50E3ADA61A1E}.Release|x64.ActiveCfg = Release|Any CPU
    19601956    {3FC7515E-D8A0-41FE-8CFA-50E3ADA61A1E}.Release|x86.ActiveCfg = Release|Any CPU
    1961     {2E257A94-D1AF-435C-99B4-5AC00EADFD6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    1962     {2E257A94-D1AF-435C-99B4-5AC00EADFD6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
    1963     {2E257A94-D1AF-435C-99B4-5AC00EADFD6A}.Debug|x64.ActiveCfg = Debug|Any CPU
    1964     {2E257A94-D1AF-435C-99B4-5AC00EADFD6A}.Debug|x86.ActiveCfg = Debug|Any CPU
    1965     {2E257A94-D1AF-435C-99B4-5AC00EADFD6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
    1966     {2E257A94-D1AF-435C-99B4-5AC00EADFD6A}.Release|Any CPU.Build.0 = Release|Any CPU
    1967     {2E257A94-D1AF-435C-99B4-5AC00EADFD6A}.Release|x64.ActiveCfg = Release|Any CPU
    1968     {2E257A94-D1AF-435C-99B4-5AC00EADFD6A}.Release|x86.ActiveCfg = Release|Any CPU
    19691957  EndGlobalSection
    19701958  GlobalSection(SolutionProperties) = preSolution

  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/CheckedTransformationListView.cs

    r10998 r11068  
    2828using HeuristicLab.MainForm;
    2929using HeuristicLab.PluginInfrastructure;
    30 using HeuristicLab.Problems.DataAnalysis.Transformations;
     30using HeuristicLab.Problems.DataAnalysis;
    3131
    3232namespace HeuristicLab.DataPreprocessing.Views {
    … …  
    6262      }
    6363      return null;
    64     } 
     64    }
    6565
    6666    private bool CanInstanciateTransformation(Type type) {

  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/HeuristicLab.DataPreprocessing.Views-3.4.csproj

    r11000 r11068  
    280280      <Private>False</Private>
    281281    </ProjectReference>
    282     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Transformations\3.4\HeuristicLab.Problems.DataAnalysis.Transformations-3.4.csproj">
    283       <Project>{2e257a94-d1af-435c-99b4-5ac00eadfd6a}</Project>
    284       <Name>HeuristicLab.Problems.DataAnalysis.Transformations-3.4</Name>
    285       <Private>False</Private>
    286     </ProjectReference>
    287282    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Views\3.4\HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj">
    288283      <Project>{3E9E8944-44FF-40BB-A622-3A4A7DD0F198}</Project>

  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/Plugin.cs.frame

    r10925 r11068  
    3333  [PluginDependency("HeuristicLab.MainForm", "3.3")]
    3434  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
    35   [PluginDependency("HeuristicLab.Problems.DataAnalysis.Views","3.4")]
    36   [PluginDependency("HeuristicLab.Problems.DataAnalysis.Transformations", "3.4")]
     35  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Views","3.4")]
    3736  public class HeuristicLabDataPreprocessingViewPlugin : PluginBase {
    3837  }

  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.Designer.cs

    r10701 r11068  
    1 namespace HeuristicLab.DataPreprocessing.Views {
     1#region License Information
     2
     3/* HeuristicLab
     4 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     5 *
     6 * This file is part of HeuristicLab.
     7 *
     8 * HeuristicLab is free software: you can redistribute it and/or modify
     9 * it under the terms of the GNU General Public License as published by
     10 * the Free Software Foundation, either version 3 of the License, or
     11 * (at your option) any later version.
     12 *
     13 * HeuristicLab is distributed in the hope that it will be useful,
     14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     16 * GNU General Public License for more details.
     17 *
     18 * You should have received a copy of the GNU General Public License
     19 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     20 */
     21
     22#endregion
     23
     24namespace HeuristicLab.DataPreprocessing.Views {
    225  partial class PreprocessingCheckedItemListView {
    326    /// <summary>

  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.cs

    r10701 r11068  
    1 using System;
    2 using System.Collections.Generic;
    3 using System.ComponentModel;
    4 using System.Drawing;
    5 using System.Data;
    6 using System.Linq;
    7 using System.Text;
     1#region License Information
     2
     3/* HeuristicLab
     4 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     5 *
     6 * This file is part of HeuristicLab.
     7 *
     8 * HeuristicLab is free software: you can redistribute it and/or modify
     9 * it under the terms of the GNU General Public License as published by
     10 * the Free Software Foundation, either version 3 of the License, or
     11 * (at your option) any later version.
     12 *
     13 * HeuristicLab is distributed in the hope that it will be useful,
     14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     16 * GNU General Public License for more details.
     17 *
     18 * You should have received a copy of the GNU General Public License
     19 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     20 */
     21
     22#endregion
     23
    824using System.Windows.Forms;
     25using HeuristicLab.Core;
    926using HeuristicLab.Core.Views;
    1027using HeuristicLab.Data;
    1128using HeuristicLab.MainForm;
    12 using HeuristicLab.Core;
    1329
    1430namespace HeuristicLab.DataPreprocessing.Views {
    … …  
    3652
    3753    }
    38 
    39     protected override void OnContentChanged() {
    40       base.OnContentChanged();
    41     }
    4254  }
    4355

  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/TransformationView.Designer.cs

    r10977 r11068  
    1919 */
    2020#endregion
    21 
    22 using HeuristicLab.Problems.DataAnalysis.Transformations;
    2321
    2422namespace HeuristicLab.DataPreprocessing.Views {
    … …  
    8886      // transformationListView
    8987      //
    90       this.transformationListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
    91             | System.Windows.Forms.AnchorStyles.Left) 
     88      this.transformationListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     89            | System.Windows.Forms.AnchorStyles.Left)
    9290            | System.Windows.Forms.AnchorStyles.Right)));
    9391      this.transformationListView.Caption = "Transformations";

  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/TransformationView.cs

    r10998 r11068  
    2525using HeuristicLab.MainForm;
    2626using HeuristicLab.MainForm.WindowsForms;
    27 using HeuristicLab.Problems.DataAnalysis.Transformations;
     27using HeuristicLab.Problems.DataAnalysis;
    2828
    2929namespace HeuristicLab.DataPreprocessing.Views {
    … …  
    3333  public partial class TransformationView : AsynchronousContentView {
    3434
    35     public new TransformationContent Content
    36     {
     35    public new TransformationContent Content {
    3736      get { return (TransformationContent)base.Content; }
    3837      set { base.Content = value; }

  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4/HeuristicLab.DataPreprocessing-3.4.csproj

    r11002 r11068  
    179179      <Private>False</Private>
    180180    </ProjectReference>
    181     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Transformations\3.4\HeuristicLab.Problems.DataAnalysis.Transformations-3.4.csproj">
    182       <Project>{2e257a94-d1af-435c-99b4-5ac00eadfd6a}</Project>
    183       <Name>HeuristicLab.Problems.DataAnalysis.Transformations-3.4</Name>
    184       <Private>False</Private>
    185     </ProjectReference>
    186181    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
    187182      <Project>{df87c13e-a889-46ff-8153-66dcaa8c5674}</Project>

  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4/Implementations/FilteredPreprocessingData.cs

    r11003 r11068  
    66using HeuristicLab.DataPreprocessing.Interfaces;
    77using HeuristicLab.Problems.DataAnalysis;
    8 using HeuristicLab.Problems.DataAnalysis.Transformations;
    98
    109namespace HeuristicLab.DataPreprocessing.Implementations {

  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4/Implementations/PreprocessingData.cs

    r11002 r11068  
    2323using System.Collections;
    2424using System.Collections.Generic;
    25 using System.Globalization;
    2625using System.Linq;
    2726using HeuristicLab.Common;
    … …  
    2928using HeuristicLab.Data;
    3029using HeuristicLab.Problems.DataAnalysis;
    31 using HeuristicLab.Problems.DataAnalysis.Transformations;
    3230
    3331namespace HeuristicLab.DataPreprocessing {
    … …  
    116114      TrainingPartition = new IntRange(problemData.TrainingPartition.Start, problemData.TrainingPartition.End);
    117115      TestPartition = new IntRange(problemData.TestPartition.Start, problemData.TestPartition.End);
    118      
     116
    119117      RegisterEventHandler();
    120118    }

  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4/Implementations/TransactionalPreprocessingData.cs

    r11002 r11068  
    2929using HeuristicLab.Data;
    3030using HeuristicLab.Problems.DataAnalysis;
    31 using HeuristicLab.Problems.DataAnalysis.Transformations;
    3231
    3332namespace HeuristicLab.DataPreprocessing {
    … …  
    6261    private TransactionalPreprocessingData(TransactionalPreprocessingData original, Cloner cloner)
    6362      : base(original, cloner) {
    64      }
     63    }
    6564
    6665    private void SaveSnapshot(DataPreprocessingChangedEventType changedType, int column, int row) {
    … …  
    9493    #region Overridden IPreprocessingData Members
    9594
    96     public override T GetCell<T>(int columnIndex, int rowIndex)
    97     {
     95    public override T GetCell<T>(int columnIndex, int rowIndex) {
    9896      return (T)variableValues[columnIndex][rowIndex];
    9997    }
    … …  
    106104    }
    107105
    108     public override string GetCellAsString(int columnIndex, int rowIndex)
    109     {
     106    public override string GetCellAsString(int columnIndex, int rowIndex) {
    110107      return variableValues[columnIndex][rowIndex].ToString();
    111108    }
    112109
    113     public override string GetVariableName(int columnIndex)
    114     {
     110    public override string GetVariableName(int columnIndex) {
    115111      return variableNames[columnIndex];
    116112    }
    117113
    118     public override int GetColumnIndex(string variableName)
    119     {
     114    public override int GetColumnIndex(string variableName) {
    120115      return variableNames.IndexOf(variableName);
    121116    }
    122117
    123     public override bool IsType<T>(int columnIndex)
    124     {
     118    public override bool IsType<T>(int columnIndex) {
    125119      return variableValues[columnIndex] is List<T>;
    126120    }
    127121
    128122    [Obsolete("use the index based variant, is faster")]
    129     public override IList<T> GetValues<T>(string variableName, bool considerSelection)
    130     {
     123    public override IList<T> GetValues<T>(string variableName, bool considerSelection) {
    131124      return GetValues<T>(GetColumnIndex(variableName), considerSelection);
    132125    }
    133126
    134     public override IList<T> GetValues<T>(int columnIndex, bool considerSelection)
    135     {
    136       if (considerSelection)
    137       {
     127    public override IList<T> GetValues<T>(int columnIndex, bool considerSelection) {
     128      if (considerSelection) {
    138129        var list = new List<T>();
    139         foreach (var rowIdx in selection[columnIndex])
    140         {
     130        foreach (var rowIdx in selection[columnIndex]) {
    141131          list.Add((T)variableValues[columnIndex][rowIdx]);
    142132        }
    143133        return list;
    144       }
    145       else
    146       {
     134      } else {
    147135        return (IList<T>)variableValues[columnIndex];
    148136      }
    … …  
    151139    public override void SetValues<T>(int columnIndex, IList<T> values) {
    152140      SaveSnapshot(DataPreprocessingChangedEventType.ChangeColumn, columnIndex, -1);
    153       if (IsType<T>(columnIndex))
    154       {
     141      if (IsType<T>(columnIndex)) {
    155142        variableValues[columnIndex] = (IList)values;
    156       }
    157       else
    158       {
     143      } else {
    159144        throw new ArgumentException("The datatype of column " + columnIndex + " must be of type " + variableValues[columnIndex].GetType().Name + " but was " + typeof(T).Name);
    160145      }
    … …  
    185170      return valid;
    186171    }
    187    
    188     public override bool Validate(string value, out string errorMessage, int columnIndex){
    189      if (columnIndex < 0 || columnIndex > VariableNames.Count()) {
     172
     173    public override bool Validate(string value, out string errorMessage, int columnIndex) {
     174      if (columnIndex < 0 || columnIndex > VariableNames.Count()) {
    190175        throw new ArgumentOutOfRangeException("column index is out of range");
    191176      }
    … …  
    234219    public override void InsertRow(int rowIndex) {
    235220      SaveSnapshot(DataPreprocessingChangedEventType.DeleteRow, -1, rowIndex);
    236       foreach (IList column in variableValues)
    237       {
     221      foreach (IList column in variableValues) {
    238222        Type type = column.GetType().GetGenericArguments()[0];
    239223        column.Insert(rowIndex, type.IsValueType ? Activator.CreateInstance(type) : null);
    … …  
    245229    public override void DeleteRow(int rowIndex) {
    246230      SaveSnapshot(DataPreprocessingChangedEventType.AddRow, -1, rowIndex);
    247       foreach (IList column in variableValues)
    248       {
     231      foreach (IList column in variableValues) {
    249232        column.RemoveAt(rowIndex);
    250233      }
    … …  
    269252    }
    270253
    271     public override Dataset ExportToDataset()
    272     {
     254    public override Dataset ExportToDataset() {
    273255      IList<IList> values = new List<IList>();
    274256
    275       for (int i = 0; i < Columns; ++i)
    276       {
     257      for (int i = 0; i < Columns; ++i) {
    277258        values.Add(variableValues[i]);
    278259      }
    … …  
    282263    }
    283264
    284     public override void ClearSelection()
    285     {
     265    public override void ClearSelection() {
    286266      Selection = new Dictionary<int, IList<int>>();
    287267    }
    … …  
    289269    public override event EventHandler SelectionChanged;
    290270
    291     protected override void OnSelectionChanged()
    292     {
     271    protected override void OnSelectionChanged() {
    293272      var listeners = SelectionChanged;
    294273      if (listeners != null) listeners(this, EventArgs.Empty);

  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4/Implementations/TransformationContent.cs

    r11001 r11068  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Problems.DataAnalysis.Transformations;
     25using HeuristicLab.Problems.DataAnalysis;
    2626
    2727namespace HeuristicLab.DataPreprocessing {
    … …  
    3636    public static new Image StaticItemImage {
    3737      get { return HeuristicLab.Common.Resources.VSImageLibrary.Method; }
    38     } 
     38    }
    3939
    4040    public TransformationContent(IPreprocessingData data, IFilterLogic filterLogic) {

  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4/Interfaces/IPreprocessingData.cs

    r11002 r11068  
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Problems.DataAnalysis;
    27 using HeuristicLab.Problems.DataAnalysis.Transformations;
    2827
    2928namespace HeuristicLab.DataPreprocessing {
    … …  
    5251    bool AreAllStringColumns(IEnumerable<int> columnIndices);
    5352    bool Validate(string value, out string errorMessage, int columnIndex);
    54    
    55       IntRange TrainingPartition { get; }
     53
     54    IntRange TrainingPartition { get; }
    5655    IntRange TestPartition { get; }
    5756

  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4/Plugin.cs.frame

    r10925 r11068  
    4444  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic", "3.4")]
    4545  [PluginDependency("HeuristicLab.Parameters","3.3")]
    46   [PluginDependency("HeuristicLab.Persistence","3.3")]
    47   [PluginDependency("HeuristicLab.Problems.DataAnalysis.Transformations", "3.4")]
     46  [PluginDependency("HeuristicLab.Persistence","3.3")]
    4847  public class HeuristicLabDataPreprocessingPlugin : PluginBase {
    4948  }

  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4/PreprocessingTransformator.cs

    r10980 r11068  
    2525using System.Text;
    2626using HeuristicLab.Data;
    27 using HeuristicLab.Problems.DataAnalysis.Transformations;
     27using HeuristicLab.Problems.DataAnalysis;
    2828
    2929namespace HeuristicLab.DataPreprocessing {
    … …  
    6464          renamedColumns.Clear();
    6565        }
    66       } finally {
     66      }
     67      finally {
    6768        preprocessingData.EndTransaction();
    6869      }
    … …  
    7172    }
    7273
    73     private void PreserveColumns(IList<Transformation<double>> transformations) {
     74    private void PreserveColumns(IEnumerable<Transformation<double>> transformations) {
    7475      foreach (var transformation in transformations) {
    7576        if (!originalColumns.ContainsKey(transformation.Column)) {
    … …  
    8182    }
    8283
    83     private void ApplyDoubleTranformationsInplace(IList<Transformation<double>> transformations, bool preserveColumns, out bool success, out string errorMsg) {
     84    private void ApplyDoubleTranformationsInplace(IEnumerable<Transformation<double>> transformations, bool preserveColumns, out bool success, out string errorMsg) {
    8485      errorMsg = string.Empty;
    8586      success = true;

  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4/ProblemDataCreator.cs

    r10990 r11068  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Problems.DataAnalysis;
    26 using HeuristicLab.Problems.DataAnalysis.Transformations;
    2726
    2827namespace HeuristicLab.DataPreprocessing {

  • branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views-3.4.csproj

    r11009 r11068  
    110110  </ItemGroup>
    111111  <ItemGroup>
    112     <Compile Include="InteractiveSymbolicRegressionSolutionSimplifierView.cs" />
     112    <Compile Include="InteractiveSymbolicRegressionSolutionSimplifierView.cs">
     113      <SubType>UserControl</SubType>
     114    </Compile>
    113115    <Compile Include="InteractiveSymbolicRegressionSolutionSimplifierView.Designer.cs">
    114116      <DependentUpon>InteractiveSymbolicRegressionSolutionSimplifierView.cs</DependentUpon>
    … …  
    244246      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name>
    245247      <Private>False</Private>
    246     </ProjectReference>
    247     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Transformations\3.4\HeuristicLab.Problems.DataAnalysis.Transformations-3.4.csproj">
    248       <Project>{2e257a94-d1af-435c-99b4-5ac00eadfd6a}</Project>
    249       <Name>HeuristicLab.Problems.DataAnalysis.Transformations-3.4</Name>
    250248    </ProjectReference>
    251249    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Views\3.4\HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj">

  • branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/Plugin.cs.frame

    r11009 r11068  
    3939  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
    4040  [PluginDependency("HeuristicLab.Optimization","3.3")]
    41   [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")]
    42   [PluginDependency("HeuristicLab.Problems.DataAnalysis.Transformations", "3.4")]
     41  [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")]
    4342  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic", "3.4")]
    4443  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic.Regression", "3.4")]

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

    r11009 r11068  
    328328      <Private>False</Private>
    329329    </ProjectReference>
    330     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Transformations\3.4\HeuristicLab.Problems.DataAnalysis.Transformations-3.4.csproj">
    331       <Project>{2e257a94-d1af-435c-99b4-5ac00eadfd6a}</Project>
    332       <Name>HeuristicLab.Problems.DataAnalysis.Transformations-3.4</Name>
    333       <Private>False</Private>
    334     </ProjectReference>
    335330    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
    336331      <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project>

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

    r10925 r11068  
    4343  [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")]
    4444  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
    45   [PluginDependency("HeuristicLab.Random", "3.3")]
    46   [PluginDependency("HeuristicLab.Problems.DataAnalysis.Transformations", "3.4")]
     45  [PluginDependency("HeuristicLab.Random", "3.3")]
    4746  public class HeuristicLabProblemsDataAnalysisSymbolicPlugin : PluginBase {
    4847  }

  • branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicExpressionTreeBacktransformator.cs

    r11011 r11068  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    26 using HeuristicLab.Problems.DataAnalysis.Transformations;
    2726
    2827namespace HeuristicLab.Problems.DataAnalysis.Symbolic {

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

    r10943 r11068  
    2222using System;
    2323using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    24 using HeuristicLab.Problems.DataAnalysis.Transformations;
    2524
    2625namespace HeuristicLab.Problems.DataAnalysis.Symbolic {

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

    r10925 r11068  
    202202      <Private>False</Private>
    203203    </ProjectReference>
    204     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Transformations\3.4\HeuristicLab.Problems.DataAnalysis.Transformations-3.4.csproj">
    205       <Project>{2e257a94-d1af-435c-99b4-5ac00eadfd6a}</Project>
    206       <Name>HeuristicLab.Problems.DataAnalysis.Transformations-3.4</Name>
    207     </ProjectReference>
    208204    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
    209205      <Project>{df87c13e-a889-46ff-8153-66dcaa8c5674}</Project>

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

    r10925 r11068  
    3838  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic", "3.4")]
    3939  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
    40   [PluginDependency("HeuristicLab.Problems.Instances.DataAnalysis", "3.3")]
    41   [PluginDependency("HeuristicLab.Problems.DataAnalysis.Transformations", "3.4")]
     40  [PluginDependency("HeuristicLab.Problems.Instances.DataAnalysis", "3.3")]
    4241  public class Plugin : PluginBase {
    4342  }

  • branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Trading/3.4/ProblemData.cs

    r11064 r11068  
    2828using HeuristicLab.Parameters;
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    30 using HeuristicLab.Problems.DataAnalysis.Transformations;
    3130
    3231namespace HeuristicLab.Problems.DataAnalysis.Trading {

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

    r10925 r11068  
    141141    <Compile Include="Implementation\TimeSeriesPrognosis\TimeSeriesPrognosisSolution.cs" />
    142142    <Compile Include="Implementation\TimeSeriesPrognosis\TimeSeriesPrognosisSolutionBase.cs" />
     143    <Compile Include="Implementation\Transformations\CopyColumnTransformation.cs" />
     144    <Compile Include="Implementation\Transformations\ExponentialTransformation.cs" />
     145    <Compile Include="Implementation\Transformations\LinearTransformation.cs" />
     146    <Compile Include="Implementation\Transformations\LogarithmicTransformation.cs" />
     147    <Compile Include="Implementation\Transformations\PowerTransformation.cs" />
     148    <Compile Include="Implementation\Transformations\ReciprocalTransformation.cs" />
     149    <Compile Include="Implementation\Transformations\ShiftStandardDistributionTransformation.cs" />
     150    <Compile Include="Implementation\Transformations\ShiftToRangeTransformation.cs" />
     151    <Compile Include="Implementation\Transformations\Transformation.cs" />
    143152    <Compile Include="Interfaces\Classification\IClassificationEnsembleModel.cs">
    144153      <SubType>Code</SubType>
    … …  
    151160    <Compile Include="Interfaces\IDependencyCalculator.cs" />
    152161    <Compile Include="Interfaces\IModelBacktransformator.cs" />
     162    <Compile Include="Interfaces\ITransformation.cs" />
    153163    <Compile Include="Interfaces\ITransformationMapper.cs" />
    154164    <Compile Include="Interfaces\Regression\IRegressionEnsembleModel.cs">
    … …  
    283293      <Private>False</Private>
    284294    </ProjectReference>
    285     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Transformations\3.4\HeuristicLab.Problems.DataAnalysis.Transformations-3.4.csproj">
    286       <Project>{2e257a94-d1af-435c-99b4-5ac00eadfd6a}</Project>
    287       <Name>HeuristicLab.Problems.DataAnalysis.Transformations-3.4</Name>
    288     </ProjectReference>
    289295    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
    290296      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>

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

    r11009 r11068  
    2828using HeuristicLab.Parameters;
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    30 using HeuristicLab.Problems.DataAnalysis.Transformations;
    3130
    3231namespace HeuristicLab.Problems.DataAnalysis {

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

    r10922 r11068  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 using HeuristicLab.Problems.DataAnalysis.Transformations;
    2726
    2827namespace HeuristicLab.Problems.DataAnalysis {

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

    r11009 r11068  
    3030using HeuristicLab.Parameters;
    3131using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    32 using HeuristicLab.Problems.DataAnalysis.Transformations;
    3332
    3433namespace HeuristicLab.Problems.DataAnalysis {
    … …  
    127126    }
    128127
    129     protected DataAnalysisProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables, IList<ITransformation> transformations) {
     128    protected DataAnalysisProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables, IEnumerable<ITransformation> transformations) {
    130129      if (dataset == null) throw new ArgumentNullException("The dataset must not be null.");
    131130      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  
    2828using HeuristicLab.Parameters;
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    30 using HeuristicLab.Problems.DataAnalysis.Transformations;
    3130
    3231namespace HeuristicLab.Problems.DataAnalysis {

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

    r11063 r11068  
    2828using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2929
    30 namespace HeuristicLab.Problems.DataAnalysis.Transformations {
     30namespace HeuristicLab.Problems.DataAnalysis {
    3131  [Item("CopyColumnTransformation", "Represents a transformation which represents a copied Column.")]
    3232  public class CopyColumnTransformation : Transformation {

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

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

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

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

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

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

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

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

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

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

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

    r11063 r11068  
    77using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    88
    9 namespace HeuristicLab.Problems.DataAnalysis.Transformations {
     9namespace HeuristicLab.Problems.DataAnalysis {
    1010  [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")]
    1111  public class ShiftStandardDistributionTransformation : Transformation<double> {

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

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

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

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

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

    r11009 r11068  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Data;
    26 using HeuristicLab.Problems.DataAnalysis.Transformations;
    2726
    2827namespace HeuristicLab.Problems.DataAnalysis {

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

    r11011 r11068  
    2121
    2222using System.Collections.Generic;
    23 using HeuristicLab.Problems.DataAnalysis.Transformations;
     23
    2424
    2525namespace HeuristicLab.Problems.DataAnalysis {

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

    r11063 r11068  
    2323using HeuristicLab.Core;
    2424
    25 namespace HeuristicLab.Problems.DataAnalysis.Transformations {
     25namespace HeuristicLab.Problems.DataAnalysis {
    2626  public interface ITransformation : IParameterizedItem {
    2727    string ShortName { get; }

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

    r10854 r11068  
    2020#endregion
    2121
    22 using HeuristicLab.Problems.DataAnalysis.Transformations;
    2322
    2423namespace HeuristicLab.Problems.DataAnalysis {

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

    r10925 r11068  
    3737  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    3838  [PluginDependency("HeuristicLab.Persistence", "3.3")]
    39   [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
    40   [PluginDependency("HeuristicLab.Problems.DataAnalysis.Transformations", "3.4")]
     39  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")] 
    4140  public class HeuristicLabProblemsDataAnalysisPlugin : PluginBase {
    4241  }

  • branches/DataPreprocessing/HeuristicLab.Problems.Instances.DataAnalysis/3.3/HeuristicLab.Problems.Instances.DataAnalysis-3.3.csproj

    r10925 r11068  
    259259      <Private>False</Private>
    260260    </ProjectReference>
    261     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Transformations\3.4\HeuristicLab.Problems.DataAnalysis.Transformations-3.4.csproj">
    262       <Project>{2e257a94-d1af-435c-99b4-5ac00eadfd6a}</Project>
    263       <Name>HeuristicLab.Problems.DataAnalysis.Transformations-3.4</Name>
    264     </ProjectReference>
    265261    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
    266262      <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project>

  • branches/DataPreprocessing/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Plugin.cs.frame

    r10925 r11068  
    3131  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    3232  [PluginDependency("HeuristicLab.Persistence", "3.3")]
    33   [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")]
    34   [PluginDependency("HeuristicLab.Problems.DataAnalysis.Transformations", "3.4")]
     33  [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")]
    3534  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
    3635  [PluginDependency("HeuristicLab.Random", "3.3")]
Note: See TracChangeset for help on using the changeset viewer.