Free cookie consent management tool by TermsFeed Policy Generator

Changeset 2352 for trunk


Ignore:
Timestamp:
09/14/09 17:35:31 (15 years ago)
Author:
gkronber
Message:

Using simple version of TheilInequalityCoefficientEvaluator in both, SVR and GP (for time-series).
Deleted GP-specific version of TheilInequalityCoefficientEvaluator. #705

Location:
trunk/sources
Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.GP.StructureIdentification.TimeSeries/3.3/DefaultTimeSeriesOperators.cs

    r2344 r2352  
    6262      seq.AddSubOperator(subScopesProc);
    6363
    64       TheilInequalityCoefficientEvaluator trainingTheil = new TheilInequalityCoefficientEvaluator();
     64      SimpleTheilInequalityCoefficientEvaluator trainingTheil = new SimpleTheilInequalityCoefficientEvaluator();
    6565      trainingTheil.Name = "TrainingTheilInequalityEvaluator";
    66       trainingTheil.GetVariableInfo("SamplesStart").ActualName = "TrainingSamplesStart";
    67       trainingTheil.GetVariableInfo("SamplesEnd").ActualName = "TrainingSamplesEnd";
     66      trainingTheil.GetVariableInfo("Values").ActualName = "TrainingValues";
    6867      trainingTheil.GetVariableInfo("TheilInequalityCoefficient").ActualName = "TrainingTheilInequalityCoefficient";
    69       trainingTheil.GetVariableInfo("TheilInequalityCoefficientBias").ActualName = "TrainingTheilInequalityCoefficientBias";
    70       trainingTheil.GetVariableInfo("TheilInequalityCoefficientVariance").ActualName = "TrainingTheilInequalityCoefficientVariance";
    71       trainingTheil.GetVariableInfo("TheilInequalityCoefficientCovariance").ActualName = "TrainingTheilInequalityCoefficientCovariance";
    72 
    73       TheilInequalityCoefficientEvaluator validationTheil = new TheilInequalityCoefficientEvaluator();
     68      SimpleTheilInequalityCoefficientEvaluator validationTheil = new SimpleTheilInequalityCoefficientEvaluator();
    7469      validationTheil.Name = "ValidationTheilInequalityEvaluator";
    75       validationTheil.GetVariableInfo("SamplesStart").ActualName = "ValidationSamplesStart";
    76       validationTheil.GetVariableInfo("SamplesEnd").ActualName = "ValidationSamplesEnd";
     70      validationTheil.GetVariableInfo("Values").ActualName = "ValidationValues";
    7771      validationTheil.GetVariableInfo("TheilInequalityCoefficient").ActualName = "ValidationTheilInequalityCoefficient";
    78       validationTheil.GetVariableInfo("TheilInequalityCoefficientBias").ActualName = "ValidationTheilInequalityCoefficientBias";
    79       validationTheil.GetVariableInfo("TheilInequalityCoefficientVariance").ActualName = "ValidationTheilInequalityCoefficientVariance";
    80       validationTheil.GetVariableInfo("TheilInequalityCoefficientCovariance").ActualName = "ValidationTheilInequalityCoefficientCovariance";
    81 
    82       TheilInequalityCoefficientEvaluator testTheil = new TheilInequalityCoefficientEvaluator();
     72      SimpleTheilInequalityCoefficientEvaluator testTheil = new SimpleTheilInequalityCoefficientEvaluator();
    8373      testTheil.Name = "TestTheilInequalityEvaluator";
    84       testTheil.GetVariableInfo("SamplesStart").ActualName = "TestSamplesStart";
    85       testTheil.GetVariableInfo("SamplesEnd").ActualName = "TestSamplesEnd";
     74      testTheil.GetVariableInfo("Values").ActualName = "TestValues";
    8675      testTheil.GetVariableInfo("TheilInequalityCoefficient").ActualName = "TestTheilInequalityCoefficient";
    87       testTheil.GetVariableInfo("TheilInequalityCoefficientBias").ActualName = "TestTheilInequalityCoefficientBias";
    88       testTheil.GetVariableInfo("TheilInequalityCoefficientVariance").ActualName = "TestTheilInequalityCoefficientVariance";
    89       testTheil.GetVariableInfo("TheilInequalityCoefficientCovariance").ActualName = "TestTheilInequalityCoefficientCovariance";
    9076
    9177      individualProc.AddSubOperator(trainingTheil);
  • trunk/sources/HeuristicLab.GP.StructureIdentification.TimeSeries/3.3/HeuristicLab.GP.StructureIdentification.TimeSeries-3.3.csproj

    r2341 r2352  
    8989    <Compile Include="Properties\AssemblyInfo.cs" />
    9090    <Compile Include="StandardGP.cs" />
    91     <Compile Include="TheilInequalityCoefficientEvaluator.cs" />
    9291  </ItemGroup>
    9392  <ItemGroup>
  • trunk/sources/HeuristicLab.SupportVectorMachines/3.2/TimeSeriesSupportVectorRegression.cs

    r2349 r2352  
    6363      ProblemInjector probInjector = new ProblemInjector();
    6464      seq.AddSubOperator(probInjector);
    65       seq.AddSubOperator(new RandomInjector());
    66 
    6765      return seq;
    6866    }
     
    8381      SequentialProcessor seqProc = new SequentialProcessor();
    8482
     83      SupportVectorEvaluator trainingEvaluator = new SupportVectorEvaluator();
     84      trainingEvaluator.GetVariableInfo("SamplesStart").ActualName = "TrainingSamplesStart";
     85      trainingEvaluator.GetVariableInfo("SamplesEnd").ActualName = "TrainingSamplesEnd";
     86      trainingEvaluator.GetVariableInfo("Values").ActualName = "TrainingValues";
     87
    8588      SimpleTheilInequalityCoefficientEvaluator trainingTheilUCalculator = new SimpleTheilInequalityCoefficientEvaluator();
     89      trainingTheilUCalculator.Name = "TrainingTheilInequalityEvaluator";
    8690      trainingTheilUCalculator.GetVariableInfo("Values").ActualName = "TrainingValues";
    8791      trainingTheilUCalculator.GetVariableInfo("TheilInequalityCoefficient").ActualName = "TrainingTheilInequalityCoefficient";
    8892      SimpleTheilInequalityCoefficientEvaluator validationTheilUCalculator = new SimpleTheilInequalityCoefficientEvaluator();
     93      validationTheilUCalculator.Name = "ValidationTheilInequalityEvaluator";
    8994      validationTheilUCalculator.GetVariableInfo("Values").ActualName = "ValidationValues";
    9095      validationTheilUCalculator.GetVariableInfo("TheilInequalityCoefficient").ActualName = "ValidationTheilInequalityCoefficient";
    9196      SimpleTheilInequalityCoefficientEvaluator testTheilUCalculator = new SimpleTheilInequalityCoefficientEvaluator();
     97      testTheilUCalculator.Name = "TestTheilInequalityEvaluator";
    9298      testTheilUCalculator.GetVariableInfo("Values").ActualName = "TestValues";
    9399      testTheilUCalculator.GetVariableInfo("TheilInequalityCoefficient").ActualName = "TestTheilInequalityCoefficient";
    94100
     101      seqProc.AddSubOperator(trainingEvaluator);
    95102      seqProc.AddSubOperator(trainingTheilUCalculator);
    96103      seqProc.AddSubOperator(validationTheilUCalculator);
Note: See TracChangeset for help on using the changeset viewer.