Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/05/09 13:27:29 (15 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/HeuristicLab.GP.StructureIdentification.Classification
Files:
3 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  }
Note: See TracChangeset for help on using the changeset viewer.