Ignore:
Timestamp:
07/09/14 13:15:37 (8 years ago)
Author:
mkommend
Message:

#2206: Reverse merged r11157.

Location:
stable
Files:
3 deleted
11 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Problems.DataAnalysis

  • stable/HeuristicLab.Problems.DataAnalysis/3.4/Dataset.cs

    r11157 r11158  
    170170        yield return value;
    171171    }
    172 
    173     public IEnumerable<string> GetStringValues(string variableName) {
    174       IList list;
    175       if (!variableValues.TryGetValue(variableName, out list))
    176         throw new ArgumentException("The variable " + variableName + " does not exist in the dataset.");
    177       List<string> values = list as List<string>;
    178       if (values == null) throw new ArgumentException("The variable " + variableName + " is not a string variable.");
    179 
    180       //mkommend yield return used to enable lazy evaluation
    181       foreach (string value in values)
    182         yield return value;
    183     }
    184 
    185     public IEnumerable<DateTime> GetDateTimeValues(string variableName) {
    186       IList list;
    187       if (!variableValues.TryGetValue(variableName, out list))
    188         throw new ArgumentException("The variable " + variableName + " does not exist in the dataset.");
    189       List<DateTime> values = list as List<DateTime>;
    190       if (values == null) throw new ArgumentException("The variable " + variableName + " is not a datetime variable.");
    191 
    192       //mkommend yield return used to enable lazy evaluation
    193       foreach (DateTime value in values)
    194         yield return value;
    195     }
    196 
    197172    public ReadOnlyCollection<double> GetReadOnlyDoubleValues(string variableName) {
    198173      IList list;
     
    219194
    220195      return rows.Select(index => values[index]);
    221     }
    222 
    223     public bool VariableHasType<T>(string variableName) {
    224       return variableValues[variableName] is IList<T>;
    225196    }
    226197
  • stable/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj

    r11157 r11158  
    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" />
    152143    <Compile Include="Interfaces\Classification\IClassificationEnsembleModel.cs">
    153144      <SubType>Code</SubType>
     
    159150    <Compile Include="Interfaces\IDataAnalysisSolutionExporter.cs" />
    160151    <Compile Include="Interfaces\IDependencyCalculator.cs" />
    161     <Compile Include="Interfaces\ITransformation.cs" />
    162     <Compile Include="Interfaces\ITransformationMapper.cs" />
    163152    <Compile Include="Interfaces\Regression\IRegressionEnsembleModel.cs">
    164153      <SubType>Code</SubType>
  • stable/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblemData.cs

    r11157 r11158  
    300300    }
    301301
    302     public ClassificationProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables, string targetVariable, IEnumerable<ITransformation> transformations = null)
    303       : base(dataset, allowedInputVariables, transformations ?? Enumerable.Empty<ITransformation>()) {
     302    public ClassificationProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables, string targetVariable)
     303      : base(dataset, allowedInputVariables) {
    304304      var validTargetVariableValues = CheckVariablesForPossibleTargetVariables(dataset).Select(x => new StringValue(x).AsReadOnly()).ToList();
    305305      var target = validTargetVariableValues.Where(x => x.Value == targetVariable).DefaultIfEmpty(validTargetVariableValues.First()).First();
  • stable/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Clustering/ClusteringProblemData.cs

    r11157 r11158  
    2121
    2222using System.Collections.Generic;
    23 using System.Linq;
    2423using HeuristicLab.Common;
    2524using HeuristicLab.Core;
     
    8786    }
    8887
    89     public ClusteringProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables, IEnumerable<ITransformation> transformations = null)
    90       : base(dataset, allowedInputVariables, transformations ?? Enumerable.Empty<ITransformation>()) {
     88    public ClusteringProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables)
     89      : base(dataset, allowedInputVariables) {
    9190    }
    9291  }
  • stable/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisProblemData.cs

    r11157 r11158  
    3838    protected const string TrainingPartitionParameterName = "TrainingPartition";
    3939    protected const string TestPartitionParameterName = "TestPartition";
    40     protected const string TransformationsParameterName = "Transformations";
    4140
    4241    #region parameter properites
     
    5251    public IFixedValueParameter<IntRange> TestPartitionParameter {
    5352      get { return (IFixedValueParameter<IntRange>)Parameters[TestPartitionParameterName]; }
    54     }
    55     public IFixedValueParameter<ReadOnlyItemList<ITransformation>> TransformationsParameter {
    56       get { return (IFixedValueParameter<ReadOnlyItemList<ITransformation>>)Parameters[TransformationsParameterName]; }
    5753    }
    5854    #endregion
     
    9389    }
    9490
    95     public IEnumerable<ITransformation> Transformations {
    96       get { return TransformationsParameter.Value; }
    97     }
    98 
    9991    public virtual bool IsTrainingSample(int index) {
    10092      return index >= 0 && index < Dataset.Rows &&
     
    119111    [StorableHook(HookType.AfterDeserialization)]
    120112    private void AfterDeserialization() {
    121       if (!Parameters.ContainsKey(TransformationsParameterName)) {
    122         Parameters.Add(new FixedValueParameter<ReadOnlyItemList<ITransformation>>(TransformationsParameterName, "", new ItemList<ITransformation>().AsReadOnly()));
    123         TransformationsParameter.Hidden = true;
    124       }
    125113      RegisterEventHandlers();
    126114    }
    127115
    128     protected DataAnalysisProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables, IEnumerable<ITransformation> transformations = null) {
     116    protected DataAnalysisProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables) {
    129117      if (dataset == null) throw new ArgumentNullException("The dataset must not be null.");
    130118      if (allowedInputVariables == null) throw new ArgumentNullException("The allowedInputVariables must not be null.");
     
    142130      int testPartitionEnd = dataset.Rows;
    143131
    144       var transformationsList = new ItemList<ITransformation>(transformations ?? Enumerable.Empty<ITransformation>());
    145 
    146132      Parameters.Add(new FixedValueParameter<Dataset>(DatasetParameterName, "", dataset));
    147133      Parameters.Add(new FixedValueParameter<ReadOnlyCheckedItemList<StringValue>>(InputVariablesParameterName, "", inputVariables.AsReadOnly()));
    148134      Parameters.Add(new FixedValueParameter<IntRange>(TrainingPartitionParameterName, "", new IntRange(trainingPartitionStart, trainingPartitionEnd)));
    149135      Parameters.Add(new FixedValueParameter<IntRange>(TestPartitionParameterName, "", new IntRange(testPartitionStart, testPartitionEnd)));
    150       Parameters.Add(new FixedValueParameter<ReadOnlyItemList<ITransformation>>(TransformationsParameterName, "", transformationsList.AsReadOnly()));
    151 
    152       TransformationsParameter.Hidden = true;
    153136
    154137      ((ValueParameter<Dataset>)DatasetParameter).ReactOnValueToStringChangedAndValueItemImageChanged = false;
     
    161144      TrainingPartition.ValueChanged += new EventHandler(Parameter_ValueChanged);
    162145      TestPartition.ValueChanged += new EventHandler(Parameter_ValueChanged);
    163       TransformationsParameter.ValueChanged += new EventHandler(Parameter_ValueChanged);
    164146    }
    165147
  • stable/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs

    r11157 r11158  
    137137    }
    138138
    139     public RegressionProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables, string targetVariable, IEnumerable<ITransformation> transformations = null)
    140       : base(dataset, allowedInputVariables, transformations ?? Enumerable.Empty<ITransformation>()) {
     139    public RegressionProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables, string targetVariable)
     140      : base(dataset, allowedInputVariables) {
    141141      var variables = InputVariables.Select(x => x.AsReadOnly()).ToList();
    142142      Parameters.Add(new ConstrainedValueParameter<StringValue>(TargetVariableParameterName, new ItemSet<StringValue>(variables), variables.Where(x => x.Value == targetVariable).First()));
  • stable/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/TimeSeriesPrognosisProblemData.cs

    r11157 r11158  
    15821582      TrainingPartition.Start = 50;
    15831583    }
    1584     public TimeSeriesPrognosisProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables, string targetVariable, IEnumerable<ITransformation> transformations = null)
    1585       : base(dataset, allowedInputVariables, targetVariable, transformations ?? Enumerable.Empty<ITransformation>()) {
     1584    public TimeSeriesPrognosisProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables, string targetVariable)
     1585      : base(dataset, allowedInputVariables, targetVariable) {
    15861586      Parameters.Add(new FixedValueParameter<IntValue>(TrainingHorizonParameterName, "Specifies the horizon (how far the prognosis reaches in the future) for each training sample.", new IntValue(1)));
    15871587      Parameters.Add(new FixedValueParameter<IntValue>(TestHorizonParameterName, "Specifies the horizon (how far the prognosis reaches in the future) for each test sample.", new IntValue(1)));
     
    16431643
    16441644      var trainingDataStart = TrainingIndices.First();
    1645 
     1645     
    16461646      base.AdjustProblemDataProperties(problemData);
    1647 
     1647     
    16481648      TestPartition.Start = trainingDataStart;
    16491649
  • stable/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IDataAnalysisProblemData.cs

    r11157 r11158  
    3939    IEnumerable<int> TestIndices { get; }
    4040
    41     IEnumerable<ITransformation> Transformations { get; }
    42 
    4341    bool IsTrainingSample(int index);
    4442    bool IsTestSample(int index);
  • stable/HeuristicLab.Problems.DataAnalysis/3.4/Plugin.cs.frame

    r11157 r11158  
    3737  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    3838  [PluginDependency("HeuristicLab.Persistence", "3.3")]
    39   [PluginDependency("HeuristicLab.Problems.Instances", "3.3")] 
     39  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
    4040  public class HeuristicLabProblemsDataAnalysisPlugin : PluginBase {
    4141  }
Note: See TracChangeset for help on using the changeset viewer.