Changeset 1253


Ignore:
Timestamp:
03/05/09 13:01:47 (11 years ago)
Author:
gkronber
Message:

Added separate editors for StandardGP and OffspringSelectionGP variants for time series forecasting. #224 (Simple frontend for GP for non-expert users (similar to HeurisicLab.SGA))

Location:
branches/CEDMA-Refactoring-Ticket419
Files:
6 added
8 edited

Legend:

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

    r1252 r1253  
    7373      seq.AddSubOperator(validationAccuracy);
    7474      seq.AddSubOperator(testAccuracy);
     75      seq.AddSubOperator(trainingConfusionMatrix);
     76      seq.AddSubOperator(validationConfusionMatrix);
     77      seq.AddSubOperator(testConfusionMatrix);
    7578      return seq;
    7679    }
  • branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification.TimeSeries/HeuristicLab.GP.StructureIdentification.TimeSeries.csproj

    r1252 r1253  
    5454      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    5555    </Reference>
     56    <Reference Include="System.Drawing" />
     57    <Reference Include="System.Windows.Forms" />
    5658    <Reference Include="System.Xml.Linq">
    5759      <RequiredTargetFramework>3.5</RequiredTargetFramework>
     
    7072    <Compile Include="HeuristicLabGPTimeSeriesPlugin.cs" />
    7173    <Compile Include="OffspringSelectionGP.cs" />
     74    <Compile Include="OffspringSelectionGpEditor.cs">
     75      <SubType>UserControl</SubType>
     76    </Compile>
     77    <Compile Include="OffspringSelectionGpEditor.Designer.cs">
     78      <DependentUpon>OffspringSelectionGpEditor.cs</DependentUpon>
     79    </Compile>
    7280    <Compile Include="ProblemInjector.cs" />
    7381    <Compile Include="ProfitEvaluator.cs" />
    7482    <Compile Include="Properties\AssemblyInfo.cs" />
    7583    <Compile Include="StandardGP.cs" />
     84    <Compile Include="StandardGpEditor.cs">
     85      <SubType>UserControl</SubType>
     86    </Compile>
     87    <Compile Include="StandardGpEditor.Designer.cs">
     88      <DependentUpon>StandardGpEditor.cs</DependentUpon>
     89    </Compile>
    7690    <Compile Include="TheilInequalityCoefficientEvaluator.cs" />
    7791  </ItemGroup>
     
    118132    <None Include="Properties\AssemblyInfo.frame" />
    119133  </ItemGroup>
     134  <ItemGroup>
     135    <EmbeddedResource Include="OffspringSelectionGpEditor.resx">
     136      <DependentUpon>OffspringSelectionGpEditor.cs</DependentUpon>
     137    </EmbeddedResource>
     138    <EmbeddedResource Include="StandardGpEditor.resx">
     139      <DependentUpon>StandardGpEditor.cs</DependentUpon>
     140    </EmbeddedResource>
     141  </ItemGroup>
    120142  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    121143  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
  • branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification.TimeSeries/OffspringSelectionGP.cs

    r1252 r1253  
    3434namespace HeuristicLab.GP.StructureIdentification.TimeSeries {
    3535  public class OffspringSelectionGP : HeuristicLab.GP.StructureIdentification.OffspringSelectionGP {
     36    private BoolData autoregressive = new BoolData();
     37    public bool Autoregressive {
     38      get { return autoregressive.Data; }
     39      set { autoregressive.Data = value; }
     40    }
     41   
    3642    protected override IOperator CreateFunctionLibraryInjector() {
    3743      return new FunctionLibraryInjector();
     
    4450    protected override IOperator CreateGlobalInjector() {
    4551      VariableInjector injector = (VariableInjector)base.CreateGlobalInjector();
    46       injector.AddVariable(new HeuristicLab.Core.Variable("Autoregressive", new BoolData(false)));
     52      injector.AddVariable(new HeuristicLab.Core.Variable("Autoregressive", autoregressive));
    4753      return injector;
    4854    }
     
    116122      return seq;
    117123    }
     124
     125    public override IEditor CreateEditor() {
     126      return new OffspringSelectionGpEditor(this);
     127    }
     128
     129    public override IView CreateView() {
     130      return new OffspringSelectionGpEditor(this);
     131    }
    118132  }
    119133}
  • branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification.TimeSeries/StandardGP.cs

    r1252 r1253  
    3434namespace HeuristicLab.GP.StructureIdentification.TimeSeries {
    3535  public class StandardGP : HeuristicLab.GP.StructureIdentification.StandardGP {
     36    private BoolData autoregressive = new BoolData();
     37    public bool Autoregressive {
     38      get { return autoregressive.Data; }
     39      set { autoregressive.Data = value; }
     40    }
     41
    3642    protected override IOperator CreateFunctionLibraryInjector() {
    3743      return new FunctionLibraryInjector();
     
    4450    protected override IOperator CreateGlobalInjector() {
    4551      VariableInjector injector = (VariableInjector)base.CreateGlobalInjector();
    46       injector.AddVariable(new HeuristicLab.Core.Variable("Autoregressive", new BoolData(false)));
     52      injector.AddVariable(new HeuristicLab.Core.Variable("Autoregressive", autoregressive));
    4753      return injector;
    4854    }
     
    9298      trainingChartInjector.GetVariableValue<IntData>("NumberOfLines", null, false).Data = 2;
    9399      trainingChartInjector.GetVariableInfo("Values").ActualName = "PredictedValuesTraining";
    94       trainingChartInjector.GetVariableInfo("LineChart").ActualName = "LineChartTrainingPredictedValues";
     100      trainingChartInjector.GetVariableInfo("Linechart").ActualName = "LinechartTrainingPredictedValues";
    95101
    96102      LinechartInjector validationChartInjector = new LinechartInjector();
    97103      validationChartInjector.GetVariableValue<IntData>("NumberOfLines", null, false).Data = 2;
    98104      validationChartInjector.GetVariableInfo("Values").ActualName = "PredictedValuesValidation";
    99       validationChartInjector.GetVariableInfo("LineChart").ActualName = "LineChartValidationPredictedValues";
     105      validationChartInjector.GetVariableInfo("Linechart").ActualName = "LinechartValidationPredictedValues";
    100106
    101107      LinechartInjector testChartInjector = new LinechartInjector();
    102108      testChartInjector.GetVariableValue<IntData>("NumberOfLines", null, false).Data = 2;
    103109      testChartInjector.GetVariableInfo("Values").ActualName = "PredictedValuesTest";
    104       testChartInjector.GetVariableInfo("LineChart").ActualName = "LineChartTestPredictedValues";
     110      testChartInjector.GetVariableInfo("Linechart").ActualName = "LinechartTestPredictedValues";
    105111
    106112      seq.AddSubOperator(trainingTheil);
     
    116122      return seq;
    117123    }
     124
     125    public override IEditor CreateEditor() {
     126      return new StandardGpEditor(this);
     127    }
     128
     129    public override IView CreateView() {
     130      return new StandardGpEditor(this);
     131    }
    118132  }
    119133}
  • branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification/OffSpringSelectionGpEditor.Designer.cs

    r1201 r1253  
    375375
    376376    private System.Windows.Forms.Button executeButton;
    377     private System.Windows.Forms.TabControl tabControl;
    378     private System.Windows.Forms.TabPage parametersTabPage;
     377    protected System.Windows.Forms.TabControl tabControl;
     378    protected System.Windows.Forms.TabPage parametersTabPage;
    379379    private System.Windows.Forms.Button abortButton;
    380380    private System.Windows.Forms.Button resetButton;
  • branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification/OffSpringSelectionGpEditor.cs

    r1236 r1253  
    5353      base.RemoveItemEvents();
    5454    }
     55
    5556    protected override void AddItemEvents() {
    5657      base.AddItemEvents();
     
    7172    }
    7273
    73     private void SetDataBinding() {
     74    protected virtual void SetDataBinding() {
    7475      setRandomSeedRandomlyCheckBox.DataBindings.Add("Checked", OffspringSelectionGP, "SetSeedRandomly");
    7576      randomSeedTextBox.DataBindings.Add("Text", OffspringSelectionGP, "Seed");
  • branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification/StandardGpEditor.Designer.cs

    r1051 r1253  
    353353
    354354    private System.Windows.Forms.Button executeButton;
    355     private System.Windows.Forms.TabControl tabControl;
    356     private System.Windows.Forms.TabPage parametersTabPage;
     355    protected System.Windows.Forms.TabControl tabControl;
     356    protected System.Windows.Forms.TabPage parametersTabPage;
    357357    private System.Windows.Forms.Button abortButton;
    358358    private System.Windows.Forms.Button resetButton;
  • branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification/StandardGpEditor.cs

    r1231 r1253  
    7171    }
    7272
    73     private void SetDataBinding() {
     73    protected virtual void SetDataBinding() {
    7474      setRandomSeedRandomlyCheckBox.DataBindings.Add("Checked", StandardGP, "SetSeedRandomly");
    7575      randomSeedTextBox.DataBindings.Add("Text", StandardGP, "Seed");
Note: See TracChangeset for help on using the changeset viewer.