Context Navigation

← Previous Change
Next Change →

Transformations

Timestamp:

02/28/19 17:42:10 (6 years ago)

Author:

gkronber

Message:

#2971: merged r16565:16631 from trunk/HeuristicLab.Problems.DataAnalysis to branch/HeuristicLab.Problems.DataAnalysis (resolving all conflicts)

Location:

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis

Files:

: 11 edited

. (modified) (1 prop)
3.4 (modified) (1 prop)
3.4/Implementation/Transformations/CopyColumnTransformation.cs (modified) (2 diffs)
3.4/Implementation/Transformations/ExponentialTransformation.cs (modified) (1 diff)
3.4/Implementation/Transformations/LinearTransformation.cs (modified) (2 diffs)
3.4/Implementation/Transformations/LogarithmicTransformation.cs (modified) (1 diff)
3.4/Implementation/Transformations/PowerTransformation.cs (modified) (1 diff)
3.4/Implementation/Transformations/ReciprocalTransformation.cs (modified) (1 diff)
3.4/Implementation/Transformations/ShiftStandardDistributionTransformation.cs (modified) (1 diff)
3.4/Implementation/Transformations/ShiftToRangeTransformation.cs (modified) (1 diff)
3.4/Implementation/Transformations/Transformation.cs (modified) (4 diffs)

Legend:

: Unmodified
: Added
: Removed

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis

Property svn:mergeinfo changed

/branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis (added)	merged: 16452-16454,16462,16476,16529,16539,16558-16559
/trunk/HeuristicLab.Problems.DataAnalysis	merged: 16565,16568,16571,16585,16625,16631

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4

Property svn:mergeinfo changed

/branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis/3.4 (added)	merged: 16452-16454,16462,16476,16529,16539,16558-16559
/trunk/HeuristicLab.Problems.DataAnalysis/3.4	merged: 16565,16568,16571,16585,16625,16631

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/CopyColumnTransformation.cs

-                      r16628
+                      r16640
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using HEAL.Attic;
 namespace HeuristicLab.Problems.DataAnalysis {
   [StorableType("3B6159C4-C929-47C6-ABCB-A36B9582ED36")]
+  [StorableType("DF78A485-8B71-46A4-8A2C-68642084D201")]
   [Item("CopyColumnTransformation", "Represents a transformation which represents a copied Column.")]
   public class CopyColumnTransformation : Transformation {

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/ExponentialTransformation.cs

-                      r16628
+                      r16640
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using HEAL.Attic;
 namespace HeuristicLab.Problems.DataAnalysis {
   [StorableType("2DA41FB6-B944-4F84-851B-8EB3DD9EB1F5")]
+  [StorableType("AAB32034-FA4A-4D70-937F-EF026C1D508A")]
   [Item("Exponential Transformation", "f(x) = b ^ x | Represents a exponential transformation.")]
   public class ExponentialTransformation : Transformation<double> {

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/LinearTransformation.cs

-                      r16628
+                      r16640
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using HEAL.Attic;
 namespace HeuristicLab.Problems.DataAnalysis {
   [StorableType("E451C88C-A33E-43F7-BCF6-AB54E5733CEE")]
+  [StorableType("203E6A27-4430-4A9E-825A-22C1B254F5E8")]
   [Item("Linear Transformation", "f(x) = k * x + d | Represents a linear transformation with multiplication and addition.")]
   public class LinearTransformation : Transformation<double> {

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/LogarithmicTransformation.cs

-                      r16628
+                      r16640
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using HEAL.Attic;
 namespace HeuristicLab.Problems.DataAnalysis {
   [StorableType("AAA306DF-F6F8-4AF2-B98F-5F6CBF1E131D")]
+  [StorableType("D3330C77-060A-4F75-A0C5-47AC81C5F2DF")]
   [Item("Logarithmic Transformation", "f(x) = log(x, b) | Represents a logarithmic transformation.")]
   public class LogarithmicTransformation : Transformation<double> {

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/PowerTransformation.cs

-                      r16628
+                      r16640
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using HEAL.Attic;
 namespace HeuristicLab.Problems.DataAnalysis {
   [StorableType("E0F646B4-57C1-4802-B133-88B27D5B5C95")]
+  [StorableType("D5A6860A-AEE5-47BE-A4D2-0107AB0A90E3")]
   [Item("Power Transformation", "f(x) = x ^ exp | Represents a power transformation.")]
   public class PowerTransformation : Transformation<double> {

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/ReciprocalTransformation.cs

-                      r16628
+                      r16640
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using HEAL.Attic;
 namespace HeuristicLab.Problems.DataAnalysis {
   [StorableType("047CD1E6-8AB3-4DDD-BC09-A1867F754AB0")]
+  [StorableType("8D242A5A-5EBB-4618-958E-A7EF34151508")]
   [Item("Reciprocal Transformation", "f(x) = 1 / x | Represents a reciprocal transformation.")]
   public class ReciprocalTransformation : Transformation<double> {

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/ShiftStandardDistributionTransformation.cs

-                      r16628
+                      r16640
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using HEAL.Attic;
 namespace HeuristicLab.Problems.DataAnalysis {
   [StorableType("749355B1-2F87-4F52-886D-F4130E56476D")]
+  [StorableType("F0DC4951-64DF-4058-8E87-748D0FA1AA21")]
   [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")]
   public class ShiftStandardDistributionTransformation : Transformation<double> {

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/ShiftToRangeTransformation.cs

-                      r16628
+                      r16640
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using HEAL.Attic;
 namespace HeuristicLab.Problems.DataAnalysis {
   [StorableType("763232A1-C3B4-4BB3-976A-A4D423511733")]
+  [StorableType("4A91E704-927C-4278-AA11-79C16BD8E4F2")]
   [Item("Shift to Range Transformation", "f(x) = k * x + d, start <= f(x) <= end | Represents a linear Transformation using Parameters defining a target range")]
   public class ShiftToRangeTransformation : LinearTransformation {

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/Transformation.cs

-                      r16628
+                      r16640
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using HEAL.Attic;
 …
   [Item("Transformation", "Represents the base class for a transformation.")]
   [StorableType("1EC26D29-A49D-4928-A982-F54641C8186A")]
+  [StorableType("46B380CC-6CDE-40FC-9BB4-E3FF82BA35EA")]
   public abstract class Transformation : ParameterizedNamedItem, ITransformation {
     protected const string ColumnParameterName = "Column";
 …
   [Item("Transformation", "Represents the base class for a transformation.")]
   [StorableType("F3B02F56-5133-4A66-A834-11FD63D89358")]
+  [StorableType("F244DB89-72EA-4B41-89FA-C2E14F30AD29")]
   public abstract class Transformation<T> : Transformation, ITransformation<T> {

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

Context Navigation

Changeset 16640 for branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations

Legend:

Download in other formats: