Free cookie consent management tool by TermsFeed Policy Generator

Changeset 1254 for branches


Ignore:
Timestamp:
03/05/09 13:27:29 (16 years ago)
Author:
gkronber
Message:

Fixed a few minor issues in hard-coded StandardGP and OffspringSelectionGP variants. #224 (Simple frontend for GP for non-expert users (similar to HeurisicLab.SGA))

Location:
branches/CEDMA-Refactoring-Ticket419
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification.Classification/HeuristicLab.GP.StructureIdentification.Classification.csproj

    r1252 r1254  
    103103      <Name>HeuristicLab.GP</Name>
    104104    </ProjectReference>
     105    <ProjectReference Include="..\HeuristicLab.Operators\HeuristicLab.Operators.csproj">
     106      <Project>{A9983BA2-B3B2-475E-8E2C-62050B71D1C5}</Project>
     107      <Name>HeuristicLab.Operators</Name>
     108    </ProjectReference>
    105109    <ProjectReference Include="..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">
    106110      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>

  • branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification.Classification/OffspringSelectionGP.cs

    r1252 r1254  
    3939    protected override IOperator CreateBestSolutionProcessor() {
    4040      IOperator seq = base.CreateBestSolutionProcessor();
    41       AccuracyEvaluator trainingAccuracy = new AccuracyEvaluator();
    42       trainingAccuracy.GetVariableInfo("Accuracy").ActualName = "TrainingAccuracy";
    43       trainingAccuracy.GetVariableInfo("SamplesStart").ActualName = "TrainingSamplesStart";
    44       trainingAccuracy.GetVariableInfo("SamplesEnd").ActualName = "TrainingSamplesEnd";
    45 
    46       AccuracyEvaluator validationAccuracy = new AccuracyEvaluator();
    47       validationAccuracy.GetVariableInfo("Accuracy").ActualName = "ValidationAccuracy";
    48       validationAccuracy.GetVariableInfo("SamplesStart").ActualName = "ValidationSamplesStart";
    49       validationAccuracy.GetVariableInfo("SamplesEnd").ActualName = "ValidationSamplesEnd";
    50 
    51       AccuracyEvaluator testAccuracy = new AccuracyEvaluator();
    52       testAccuracy.GetVariableInfo("Accuracy").ActualName = "TestAccuracy";
    53       testAccuracy.GetVariableInfo("SamplesStart").ActualName = "TestSamplesStart";
    54       testAccuracy.GetVariableInfo("SamplesEnd").ActualName = "TestSamplesEnd";
    55 
    56       ConfusionMatrixEvaluator trainingConfusionMatrix = new ConfusionMatrixEvaluator();
    57       trainingConfusionMatrix.GetVariableInfo("ConfusionMatrix").ActualName = "TrainingConfusionMatrix";
    58       trainingConfusionMatrix.GetVariableInfo("SamplesStart").ActualName = "TrainingSamplesStart";
    59       trainingConfusionMatrix.GetVariableInfo("SamplesEnd").ActualName = "TrainingSamplesEnd";
    60 
    61       ConfusionMatrixEvaluator validationConfusionMatrix = new ConfusionMatrixEvaluator();
    62       validationConfusionMatrix.GetVariableInfo("ConfusionMatrix").ActualName = "ValidationConfusionMatrix";
    63       validationConfusionMatrix.GetVariableInfo("SamplesStart").ActualName = "ValidationSamplesStart";
    64       validationConfusionMatrix.GetVariableInfo("SamplesEnd").ActualName = "ValidationSamplesEnd";
    65 
    66       ConfusionMatrixEvaluator testConfusionMatrix = new ConfusionMatrixEvaluator();
    67       testConfusionMatrix.GetVariableInfo("ConfusionMatrix").ActualName = "TestConfusionMatrix";
    68       testConfusionMatrix.GetVariableInfo("SamplesStart").ActualName = "TestSamplesStart";
    69       testConfusionMatrix.GetVariableInfo("SamplesEnd").ActualName = "TestSamplesEnd";
    70 
    71       seq.AddSubOperator(trainingAccuracy);
    72       seq.AddSubOperator(validationAccuracy);
    73       seq.AddSubOperator(testAccuracy);
    74       seq.AddSubOperator(trainingConfusionMatrix);
    75       seq.AddSubOperator(validationConfusionMatrix);
    76       seq.AddSubOperator(testConfusionMatrix);
     41      seq.AddSubOperator(StandardGP.BestSolutionProcessor);
    7742      return seq;
    7843    }

  • branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification.Classification/StandardGP.cs

    r1253 r1254  
    3030using HeuristicLab.Random;
    3131using HeuristicLab.Data;
     32using HeuristicLab.Operators;
    3233
    3334namespace HeuristicLab.GP.StructureIdentification.Classification {
    … …  
    4041    protected override IOperator CreateBestSolutionProcessor() {
    4142      IOperator seq = base.CreateBestSolutionProcessor();
    42       AccuracyEvaluator trainingAccuracy = new AccuracyEvaluator();
    43       trainingAccuracy.GetVariableInfo("Accuracy").ActualName = "TrainingAccuracy";
    44       trainingAccuracy.GetVariableInfo("SamplesStart").ActualName = "TrainingSamplesStart";
    45       trainingAccuracy.GetVariableInfo("SamplesEnd").ActualName = "TrainingSamplesEnd";
     43      seq.AddSubOperator(BestSolutionProcessor);
     44      return seq;
     45    }
    4646
    47       AccuracyEvaluator validationAccuracy = new AccuracyEvaluator();
    48       validationAccuracy.GetVariableInfo("Accuracy").ActualName = "ValidationAccuracy";
    49       validationAccuracy.GetVariableInfo("SamplesStart").ActualName = "ValidationSamplesStart";
    50       validationAccuracy.GetVariableInfo("SamplesEnd").ActualName = "ValidationSamplesEnd";
     47    internal static IOperator BestSolutionProcessor {
     48      get {
     49        SequentialProcessor seq = new SequentialProcessor();
     50        AccuracyEvaluator trainingAccuracy = new AccuracyEvaluator();
     51        trainingAccuracy.GetVariableInfo("Accuracy").ActualName = "TrainingAccuracy";
     52        trainingAccuracy.GetVariableInfo("SamplesStart").ActualName = "TrainingSamplesStart";
     53        trainingAccuracy.GetVariableInfo("SamplesEnd").ActualName = "TrainingSamplesEnd";
    5154
    52       AccuracyEvaluator testAccuracy = new AccuracyEvaluator();
    53       testAccuracy.GetVariableInfo("Accuracy").ActualName = "TestAccuracy";
    54       testAccuracy.GetVariableInfo("SamplesStart").ActualName = "TestSamplesStart";
    55       testAccuracy.GetVariableInfo("SamplesEnd").ActualName = "TestSamplesEnd";
     55        AccuracyEvaluator validationAccuracy = new AccuracyEvaluator();
     56        validationAccuracy.GetVariableInfo("Accuracy").ActualName = "ValidationAccuracy";
     57        validationAccuracy.GetVariableInfo("SamplesStart").ActualName = "ValidationSamplesStart";
     58        validationAccuracy.GetVariableInfo("SamplesEnd").ActualName = "ValidationSamplesEnd";
    5659
    57       ConfusionMatrixEvaluator trainingConfusionMatrix = new ConfusionMatrixEvaluator();
    58       trainingConfusionMatrix.GetVariableInfo("ConfusionMatrix").ActualName = "TrainingConfusionMatrix";
    59       trainingConfusionMatrix.GetVariableInfo("SamplesStart").ActualName = "TrainingSamplesStart";
    60       trainingConfusionMatrix.GetVariableInfo("SamplesEnd").ActualName = "TrainingSamplesEnd";
     60        AccuracyEvaluator testAccuracy = new AccuracyEvaluator();
     61        testAccuracy.GetVariableInfo("Accuracy").ActualName = "TestAccuracy";
     62        testAccuracy.GetVariableInfo("SamplesStart").ActualName = "TestSamplesStart";
     63        testAccuracy.GetVariableInfo("SamplesEnd").ActualName = "TestSamplesEnd";
    6164
    62       ConfusionMatrixEvaluator validationConfusionMatrix = new ConfusionMatrixEvaluator();
    63       validationConfusionMatrix.GetVariableInfo("ConfusionMatrix").ActualName = "ValidationConfusionMatrix";
    64       validationConfusionMatrix.GetVariableInfo("SamplesStart").ActualName = "ValidationSamplesStart";
    65       validationConfusionMatrix.GetVariableInfo("SamplesEnd").ActualName = "ValidationSamplesEnd";
     65        ConfusionMatrixEvaluator trainingConfusionMatrix = new ConfusionMatrixEvaluator();
     66        trainingConfusionMatrix.GetVariableInfo("ConfusionMatrix").ActualName = "TrainingConfusionMatrix";
     67        trainingConfusionMatrix.GetVariableInfo("SamplesStart").ActualName = "TrainingSamplesStart";
     68        trainingConfusionMatrix.GetVariableInfo("SamplesEnd").ActualName = "TrainingSamplesEnd";
    6669
    67       ConfusionMatrixEvaluator testConfusionMatrix = new ConfusionMatrixEvaluator();
    68       testConfusionMatrix.GetVariableInfo("ConfusionMatrix").ActualName = "TestConfusionMatrix";
    69       testConfusionMatrix.GetVariableInfo("SamplesStart").ActualName = "TestSamplesStart";
    70       testConfusionMatrix.GetVariableInfo("SamplesEnd").ActualName = "TestSamplesEnd";
     70        ConfusionMatrixEvaluator validationConfusionMatrix = new ConfusionMatrixEvaluator();
     71        validationConfusionMatrix.GetVariableInfo("ConfusionMatrix").ActualName = "ValidationConfusionMatrix";
     72        validationConfusionMatrix.GetVariableInfo("SamplesStart").ActualName = "ValidationSamplesStart";
     73        validationConfusionMatrix.GetVariableInfo("SamplesEnd").ActualName = "ValidationSamplesEnd";
    7174
    72       seq.AddSubOperator(trainingAccuracy);
    73       seq.AddSubOperator(validationAccuracy);
    74       seq.AddSubOperator(testAccuracy);
    75       seq.AddSubOperator(trainingConfusionMatrix);
    76       seq.AddSubOperator(validationConfusionMatrix);
    77       seq.AddSubOperator(testConfusionMatrix);
    78       return seq;
     75        ConfusionMatrixEvaluator testConfusionMatrix = new ConfusionMatrixEvaluator();
     76        testConfusionMatrix.GetVariableInfo("ConfusionMatrix").ActualName = "TestConfusionMatrix";
     77        testConfusionMatrix.GetVariableInfo("SamplesStart").ActualName = "TestSamplesStart";
     78        testConfusionMatrix.GetVariableInfo("SamplesEnd").ActualName = "TestSamplesEnd";
     79
     80        seq.AddSubOperator(trainingAccuracy);
     81        seq.AddSubOperator(validationAccuracy);
     82        seq.AddSubOperator(testAccuracy);
     83        seq.AddSubOperator(trainingConfusionMatrix);
     84        seq.AddSubOperator(validationConfusionMatrix);
     85        seq.AddSubOperator(testConfusionMatrix);
     86        return seq;
     87      }
    7988    }
    8089  }

  • branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification.TimeSeries/OffspringSelectionGP.cs

    r1253 r1254  
    5656    protected override IOperator CreateBestSolutionProcessor() {
    5757      IOperator seq = base.CreateBestSolutionProcessor();
    58       TheilInequalityCoefficientEvaluator trainingTheil = new TheilInequalityCoefficientEvaluator();
    59       trainingTheil.GetVariableInfo("SamplesStart").ActualName = "TrainingSamplesStart";
    60       trainingTheil.GetVariableInfo("SamplesEnd").ActualName = "TrainingSamplesEnd";
    61       trainingTheil.GetVariableInfo("TheilInequalityCoefficient").ActualName = "TrainingTheilInequalityCoefficient";
    62       trainingTheil.GetVariableInfo("TheilInequalityCoefficientBias").ActualName = "TrainingTheilInequalityCoefficientBias";
    63       trainingTheil.GetVariableInfo("TheilInequalityCoefficientVariance").ActualName = "TrainingTheilInequalityCoefficientVariance";
    64       trainingTheil.GetVariableInfo("TheilInequalityCoefficientCovariance").ActualName = "TrainingTheilInequalityCoefficientCovariance";
    65 
    66       TheilInequalityCoefficientEvaluator validationTheil = new TheilInequalityCoefficientEvaluator();
    67       validationTheil.GetVariableInfo("SamplesStart").ActualName = "ValidationSamplesStart";
    68       validationTheil.GetVariableInfo("SamplesEnd").ActualName = "ValidationSamplesEnd";
    69       validationTheil.GetVariableInfo("TheilInequalityCoefficient").ActualName = "ValidationTheilInequalityCoefficient";
    70       validationTheil.GetVariableInfo("TheilInequalityCoefficientBias").ActualName = "ValidationTheilInequalityCoefficientBias";
    71       validationTheil.GetVariableInfo("TheilInequalityCoefficientVariance").ActualName = "ValidationTheilInequalityCoefficientVariance";
    72       validationTheil.GetVariableInfo("TheilInequalityCoefficientCovariance").ActualName = "ValidationTheilInequalityCoefficientCovariance";
    73 
    74       TheilInequalityCoefficientEvaluator testTheil = new TheilInequalityCoefficientEvaluator();
    75       testTheil.GetVariableInfo("SamplesStart").ActualName = "TestSamplesStart";
    76       testTheil.GetVariableInfo("SamplesEnd").ActualName = "TestSamplesEnd";
    77       testTheil.GetVariableInfo("TheilInequalityCoefficient").ActualName = "TestTheilInequalityCoefficient";
    78       testTheil.GetVariableInfo("TheilInequalityCoefficientBias").ActualName = "TestTheilInequalityCoefficientBias";
    79       testTheil.GetVariableInfo("TheilInequalityCoefficientVariance").ActualName = "TestTheilInequalityCoefficientVariance";
    80       testTheil.GetVariableInfo("TheilInequalityCoefficientCovariance").ActualName = "TestTheilInequalityCoefficientCovariance";
    81 
    82       SimpleEvaluator trainingEvaluator = new SimpleEvaluator();
    83       trainingEvaluator.GetVariableInfo("SamplesStart").ActualName = "TrainingSamplesStart";
    84       trainingEvaluator.GetVariableInfo("SamplesEnd").ActualName = "TrainingSamplesEnd";
    85       trainingEvaluator.GetVariableInfo("Values").ActualName = "PredictedValuesTraining";
    86 
    87       SimpleEvaluator validationEvaluator = new SimpleEvaluator();
    88       validationEvaluator.GetVariableInfo("SamplesStart").ActualName = "ValidationSamplesStart";
    89       validationEvaluator.GetVariableInfo("SamplesEnd").ActualName = "ValidationSamplesEnd";
    90       validationEvaluator.GetVariableInfo("Values").ActualName = "PredictedValuesValidation";
    91      
    92       SimpleEvaluator testEvaluator = new SimpleEvaluator();
    93       testEvaluator.GetVariableInfo("SamplesStart").ActualName = "TestSamplesStart";
    94       testEvaluator.GetVariableInfo("SamplesEnd").ActualName = "TestSamplesEnd";
    95       testEvaluator.GetVariableInfo("Values").ActualName = "PredictedValuesTest";
    96 
    97       LinechartInjector trainingChartInjector = new LinechartInjector();
    98       trainingChartInjector.GetVariableValue<IntData>("NumberOfLines", null, false).Data = 2;
    99       trainingChartInjector.GetVariableInfo("Values").ActualName = "PredictedValuesTraining";
    100       trainingChartInjector.GetVariableInfo("Linechart").ActualName = "LinechartTrainingPredictedValues";
    101 
    102       LinechartInjector validationChartInjector = new LinechartInjector();
    103       validationChartInjector.GetVariableValue<IntData>("NumberOfLines", null, false).Data = 2;
    104       validationChartInjector.GetVariableInfo("Values").ActualName = "PredictedValuesValidation";
    105       validationChartInjector.GetVariableInfo("Linechart").ActualName = "LinechartValidationPredictedValues";
    106 
    107       LinechartInjector testChartInjector = new LinechartInjector();
    108       testChartInjector.GetVariableValue<IntData>("NumberOfLines", null, false).Data = 2;
    109       testChartInjector.GetVariableInfo("Values").ActualName = "PredictedValuesTest";
    110       testChartInjector.GetVariableInfo("Linechart").ActualName = "LinechartTestPredictedValues";
    111 
    112       seq.AddSubOperator(trainingTheil);
    113       seq.AddSubOperator(validationTheil);
    114       seq.AddSubOperator(testTheil);
    115       seq.AddSubOperator(trainingEvaluator);
    116       seq.AddSubOperator(trainingChartInjector);
    117       seq.AddSubOperator(validationEvaluator);
    118       seq.AddSubOperator(validationChartInjector);
    119       seq.AddSubOperator(testEvaluator);
    120       seq.AddSubOperator(testChartInjector);
    121 
     58      seq.AddSubOperator(StandardGP.BestSolutionProcessor);
    12259      return seq;
    12360    }

  • branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification.TimeSeries/StandardGP.cs

    r1253 r1254  
    5656    protected override IOperator CreateBestSolutionProcessor() {
    5757      IOperator seq = base.CreateBestSolutionProcessor();
    58       TheilInequalityCoefficientEvaluator trainingTheil = new TheilInequalityCoefficientEvaluator();
    59       trainingTheil.GetVariableInfo("SamplesStart").ActualName = "TrainingSamplesStart";
    60       trainingTheil.GetVariableInfo("SamplesEnd").ActualName = "TrainingSamplesEnd";
    61       trainingTheil.GetVariableInfo("TheilInequalityCoefficient").ActualName = "TrainingTheilInequalityCoefficient";
    62       trainingTheil.GetVariableInfo("TheilInequalityCoefficientBias").ActualName = "TrainingTheilInequalityCoefficientBias";
    63       trainingTheil.GetVariableInfo("TheilInequalityCoefficientVariance").ActualName = "TrainingTheilInequalityCoefficientVariance";
    64       trainingTheil.GetVariableInfo("TheilInequalityCoefficientCovariance").ActualName = "TrainingTheilInequalityCoefficientCovariance";
    65 
    66       TheilInequalityCoefficientEvaluator validationTheil = new TheilInequalityCoefficientEvaluator();
    67       validationTheil.GetVariableInfo("SamplesStart").ActualName = "ValidationSamplesStart";
    68       validationTheil.GetVariableInfo("SamplesEnd").ActualName = "ValidationSamplesEnd";
    69       validationTheil.GetVariableInfo("TheilInequalityCoefficient").ActualName = "ValidationTheilInequalityCoefficient";
    70       validationTheil.GetVariableInfo("TheilInequalityCoefficientBias").ActualName = "ValidationTheilInequalityCoefficientBias";
    71       validationTheil.GetVariableInfo("TheilInequalityCoefficientVariance").ActualName = "ValidationTheilInequalityCoefficientVariance";
    72       validationTheil.GetVariableInfo("TheilInequalityCoefficientCovariance").ActualName = "ValidationTheilInequalityCoefficientCovariance";
    73 
    74       TheilInequalityCoefficientEvaluator testTheil = new TheilInequalityCoefficientEvaluator();
    75       testTheil.GetVariableInfo("SamplesStart").ActualName = "TestSamplesStart";
    76       testTheil.GetVariableInfo("SamplesEnd").ActualName = "TestSamplesEnd";
    77       testTheil.GetVariableInfo("TheilInequalityCoefficient").ActualName = "TestTheilInequalityCoefficient";
    78       testTheil.GetVariableInfo("TheilInequalityCoefficientBias").ActualName = "TestTheilInequalityCoefficientBias";
    79       testTheil.GetVariableInfo("TheilInequalityCoefficientVariance").ActualName = "TestTheilInequalityCoefficientVariance";
    80       testTheil.GetVariableInfo("TheilInequalityCoefficientCovariance").ActualName = "TestTheilInequalityCoefficientCovariance";
    81 
    82       SimpleEvaluator trainingEvaluator = new SimpleEvaluator();
    83       trainingEvaluator.GetVariableInfo("SamplesStart").ActualName = "TrainingSamplesStart";
    84       trainingEvaluator.GetVariableInfo("SamplesEnd").ActualName = "TrainingSamplesEnd";
    85       trainingEvaluator.GetVariableInfo("Values").ActualName = "PredictedValuesTraining";
    86 
    87       SimpleEvaluator validationEvaluator = new SimpleEvaluator();
    88       validationEvaluator.GetVariableInfo("SamplesStart").ActualName = "ValidationSamplesStart";
    89       validationEvaluator.GetVariableInfo("SamplesEnd").ActualName = "ValidationSamplesEnd";
    90       validationEvaluator.GetVariableInfo("Values").ActualName = "PredictedValuesValidation";
    91 
    92       SimpleEvaluator testEvaluator = new SimpleEvaluator();
    93       testEvaluator.GetVariableInfo("SamplesStart").ActualName = "TestSamplesStart";
    94       testEvaluator.GetVariableInfo("SamplesEnd").ActualName = "TestSamplesEnd";
    95       testEvaluator.GetVariableInfo("Values").ActualName = "PredictedValuesTest";
    96 
    97       LinechartInjector trainingChartInjector = new LinechartInjector();
    98       trainingChartInjector.GetVariableValue<IntData>("NumberOfLines", null, false).Data = 2;
    99       trainingChartInjector.GetVariableInfo("Values").ActualName = "PredictedValuesTraining";
    100       trainingChartInjector.GetVariableInfo("Linechart").ActualName = "LinechartTrainingPredictedValues";
    101 
    102       LinechartInjector validationChartInjector = new LinechartInjector();
    103       validationChartInjector.GetVariableValue<IntData>("NumberOfLines", null, false).Data = 2;
    104       validationChartInjector.GetVariableInfo("Values").ActualName = "PredictedValuesValidation";
    105       validationChartInjector.GetVariableInfo("Linechart").ActualName = "LinechartValidationPredictedValues";
    106 
    107       LinechartInjector testChartInjector = new LinechartInjector();
    108       testChartInjector.GetVariableValue<IntData>("NumberOfLines", null, false).Data = 2;
    109       testChartInjector.GetVariableInfo("Values").ActualName = "PredictedValuesTest";
    110       testChartInjector.GetVariableInfo("Linechart").ActualName = "LinechartTestPredictedValues";
    111 
    112       seq.AddSubOperator(trainingTheil);
    113       seq.AddSubOperator(validationTheil);
    114       seq.AddSubOperator(testTheil);
    115       seq.AddSubOperator(trainingEvaluator);
    116       seq.AddSubOperator(trainingChartInjector);
    117       seq.AddSubOperator(validationEvaluator);
    118       seq.AddSubOperator(validationChartInjector);
    119       seq.AddSubOperator(testEvaluator);
    120       seq.AddSubOperator(testChartInjector);
    121 
     58      seq.AddSubOperator(BestSolutionProcessor);
    12259      return seq;
    12360    }
    … …  
    13067      return new StandardGpEditor(this);
    13168    }
     69
     70    internal static IOperator BestSolutionProcessor {
     71      get {
     72        SequentialProcessor seq = new SequentialProcessor();
     73        TheilInequalityCoefficientEvaluator trainingTheil = new TheilInequalityCoefficientEvaluator();
     74        trainingTheil.GetVariableInfo("SamplesStart").ActualName = "TrainingSamplesStart";
     75        trainingTheil.GetVariableInfo("SamplesEnd").ActualName = "TrainingSamplesEnd";
     76        trainingTheil.GetVariableInfo("TheilInequalityCoefficient").ActualName = "TrainingTheilInequalityCoefficient";
     77        trainingTheil.GetVariableInfo("TheilInequalityCoefficientBias").ActualName = "TrainingTheilInequalityCoefficientBias";
     78        trainingTheil.GetVariableInfo("TheilInequalityCoefficientVariance").ActualName = "TrainingTheilInequalityCoefficientVariance";
     79        trainingTheil.GetVariableInfo("TheilInequalityCoefficientCovariance").ActualName = "TrainingTheilInequalityCoefficientCovariance";
     80
     81        TheilInequalityCoefficientEvaluator validationTheil = new TheilInequalityCoefficientEvaluator();
     82        validationTheil.GetVariableInfo("SamplesStart").ActualName = "ValidationSamplesStart";
     83        validationTheil.GetVariableInfo("SamplesEnd").ActualName = "ValidationSamplesEnd";
     84        validationTheil.GetVariableInfo("TheilInequalityCoefficient").ActualName = "ValidationTheilInequalityCoefficient";
     85        validationTheil.GetVariableInfo("TheilInequalityCoefficientBias").ActualName = "ValidationTheilInequalityCoefficientBias";
     86        validationTheil.GetVariableInfo("TheilInequalityCoefficientVariance").ActualName = "ValidationTheilInequalityCoefficientVariance";
     87        validationTheil.GetVariableInfo("TheilInequalityCoefficientCovariance").ActualName = "ValidationTheilInequalityCoefficientCovariance";
     88
     89        TheilInequalityCoefficientEvaluator testTheil = new TheilInequalityCoefficientEvaluator();
     90        testTheil.GetVariableInfo("SamplesStart").ActualName = "TestSamplesStart";
     91        testTheil.GetVariableInfo("SamplesEnd").ActualName = "TestSamplesEnd";
     92        testTheil.GetVariableInfo("TheilInequalityCoefficient").ActualName = "TestTheilInequalityCoefficient";
     93        testTheil.GetVariableInfo("TheilInequalityCoefficientBias").ActualName = "TestTheilInequalityCoefficientBias";
     94        testTheil.GetVariableInfo("TheilInequalityCoefficientVariance").ActualName = "TestTheilInequalityCoefficientVariance";
     95        testTheil.GetVariableInfo("TheilInequalityCoefficientCovariance").ActualName = "TestTheilInequalityCoefficientCovariance";
     96
     97        SimpleEvaluator trainingEvaluator = new SimpleEvaluator();
     98        trainingEvaluator.GetVariableInfo("SamplesStart").ActualName = "TrainingSamplesStart";
     99        trainingEvaluator.GetVariableInfo("SamplesEnd").ActualName = "TrainingSamplesEnd";
     100        trainingEvaluator.GetVariableInfo("Values").ActualName = "PredictedValuesTraining";
     101
     102        SimpleEvaluator validationEvaluator = new SimpleEvaluator();
     103        validationEvaluator.GetVariableInfo("SamplesStart").ActualName = "ValidationSamplesStart";
     104        validationEvaluator.GetVariableInfo("SamplesEnd").ActualName = "ValidationSamplesEnd";
     105        validationEvaluator.GetVariableInfo("Values").ActualName = "PredictedValuesValidation";
     106
     107        SimpleEvaluator testEvaluator = new SimpleEvaluator();
     108        testEvaluator.GetVariableInfo("SamplesStart").ActualName = "TestSamplesStart";
     109        testEvaluator.GetVariableInfo("SamplesEnd").ActualName = "TestSamplesEnd";
     110        testEvaluator.GetVariableInfo("Values").ActualName = "PredictedValuesTest";
     111
     112        LinechartInjector trainingChartInjector = new LinechartInjector();
     113        trainingChartInjector.GetVariableValue<IntData>("NumberOfLines", null, false).Data = 2;
     114        trainingChartInjector.GetVariableInfo("Values").ActualName = "PredictedValuesTraining";
     115        trainingChartInjector.GetVariableInfo("Linechart").ActualName = "LinechartTrainingPredictedValues";
     116
     117        LinechartInjector validationChartInjector = new LinechartInjector();
     118        validationChartInjector.GetVariableValue<IntData>("NumberOfLines", null, false).Data = 2;
     119        validationChartInjector.GetVariableInfo("Values").ActualName = "PredictedValuesValidation";
     120        validationChartInjector.GetVariableInfo("Linechart").ActualName = "LinechartValidationPredictedValues";
     121
     122        LinechartInjector testChartInjector = new LinechartInjector();
     123        testChartInjector.GetVariableValue<IntData>("NumberOfLines", null, false).Data = 2;
     124        testChartInjector.GetVariableInfo("Values").ActualName = "PredictedValuesTest";
     125        testChartInjector.GetVariableInfo("Linechart").ActualName = "LinechartTestPredictedValues";
     126
     127        seq.AddSubOperator(trainingTheil);
     128        seq.AddSubOperator(validationTheil);
     129        seq.AddSubOperator(testTheil);
     130        seq.AddSubOperator(trainingEvaluator);
     131        seq.AddSubOperator(trainingChartInjector);
     132        seq.AddSubOperator(validationEvaluator);
     133        seq.AddSubOperator(validationChartInjector);
     134        seq.AddSubOperator(testEvaluator);
     135        seq.AddSubOperator(testChartInjector);
     136
     137        return seq;
     138      }
     139    }
    132140  }
    133141}
Note: See TracChangeset for help on using the changeset viewer.