Free cookie consent management tool by TermsFeed Policy Generator

Changeset 1252


Ignore:
Timestamp:
03/05/09 11:03:42 (15 years ago)
Author:
gkronber
Message:

Renamed StructIdProblemInjector classes to ProblemInjector. #224 (Simple frontend for GP for non-expert users (similar to HeurisicLab.SGA))

Location:
branches/CEDMA-Refactoring-Ticket419
Files:
9 edited
6 moved

Legend:

Unmodified
Added
Removed

  • branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Server/DispatcherBase.cs

    r1217 r1252  
    100100
    101101    private Execution CreateStandardGpExecution(Problem problem, int targetVariable, ModelComplexity complexity) {
    102       ProblemInjector probInjector = new ProblemInjector(problem);
     102      HeuristicLab.CEDMA.Core.ProblemInjector probInjector = new HeuristicLab.CEDMA.Core.ProblemInjector(problem);
    103103      probInjector.TargetVariable = targetVariable;
    104104      StandardGP sgp = new StandardGP();

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

    r1251 r1252  
    7373    <Compile Include="MulticlassOneVsOneAnalyzer.cs" />
    7474    <Compile Include="OffspringSelectionGP.cs" />
     75    <Compile Include="ProblemInjector.cs" />
    7576    <Compile Include="Properties\AssemblyInfo.cs" />
    7677    <Compile Include="ROCAnalyzer.cs" />
    7778    <Compile Include="StandardGP.cs" />
    78     <Compile Include="StructIdProblemInjector.cs" />
    7979  </ItemGroup>
    8080  <ItemGroup>

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

    r1251 r1252  
    3434  public class OffspringSelectionGP : HeuristicLab.GP.StructureIdentification.OffspringSelectionGP {
    3535    protected override IOperator CreateProblemInjector() {
    36       return new StructIdProblemInjector();
     36      return new ProblemInjector();
    3737    }
    3838

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

    r1251 r1252  
    2828
    2929namespace HeuristicLab.GP.StructureIdentification.Classification {
    30   public class StructIdProblemInjector : HeuristicLab.GP.StructureIdentification.StructIdProblemInjector {
     30  public class ProblemInjector : HeuristicLab.GP.StructureIdentification.ProblemInjector {
    3131
    3232    public override string Description {
    … …  
    3636    }
    3737
    38     public StructIdProblemInjector()
     38    public ProblemInjector()
    3939      : base() {
    4040      AddVariableInfo(new Core.VariableInfo("TargetClassValues", "TargetClassValues", typeof(ItemList<DoubleData>), Core.VariableKind.New));

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

    r1251 r1252  
    3535
    3636    protected override IOperator CreateProblemInjector() {
    37       return new StructIdProblemInjector();
     37      return new ProblemInjector();
    3838    }
    3939

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

    r1251 r1252  
    7070    <Compile Include="HeuristicLabGPTimeSeriesPlugin.cs" />
    7171    <Compile Include="OffspringSelectionGP.cs" />
     72    <Compile Include="ProblemInjector.cs" />
    7273    <Compile Include="ProfitEvaluator.cs" />
    7374    <Compile Include="Properties\AssemblyInfo.cs" />
    7475    <Compile Include="StandardGP.cs" />
    75     <Compile Include="StructIdProblemInjector.cs" />
    7676    <Compile Include="TheilInequalityCoefficientEvaluator.cs" />
    7777  </ItemGroup>

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

    r1251 r1252  
    3939
    4040    protected override IOperator CreateProblemInjector() {
    41       return new StructIdProblemInjector();
     41      return new ProblemInjector();
    4242    }
    4343

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

    r1251 r1252  
    3030
    3131namespace HeuristicLab.GP.StructureIdentification.TimeSeries {
    32   public class StructIdProblemInjector : HeuristicLab.GP.StructureIdentification.StructIdProblemInjector {
     32  public class ProblemInjector : HeuristicLab.GP.StructureIdentification.ProblemInjector {
    3333
    3434    public override string Description {
    … …  
    3838    }
    3939
    40     public StructIdProblemInjector()
     40    public ProblemInjector()
    4141      : base() {
    4242      AddVariableInfo(new Core.VariableInfo("MaxTimeOffset", "MaxTimeOffset", typeof(IntData), Core.VariableKind.New));

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

    r1251 r1252  
    3939
    4040    protected override IOperator CreateProblemInjector() {
    41       return new StructIdProblemInjector();
     41      return new ProblemInjector();
    4242    }
    4343

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

    r1246 r1252  
    8080    <Compile Include="OffSpringSelectionGpEditor.Designer.cs">
    8181      <DependentUpon>OffSpringSelectionGpEditor.cs</DependentUpon>
     82    </Compile>
     83    <Compile Include="ProblemInjector.cs" />
     84    <Compile Include="ProblemInjectorView.cs">
     85      <SubType>UserControl</SubType>
     86    </Compile>
     87    <Compile Include="ProblemInjectorView.Designer.cs">
     88      <DependentUpon>ProblemInjectorView.cs</DependentUpon>
    8289    </Compile>
    8390    <Compile Include="StandardGpEditor.cs">
    … …  
    115122    <Compile Include="Sinus.cs" />
    116123    <Compile Include="Sqrt.cs" />
    117     <Compile Include="StructIdProblemInjector.cs" />
    118     <Compile Include="StructIdProblemInjectorView.cs">
    119       <SubType>UserControl</SubType>
    120     </Compile>
    121     <Compile Include="StructIdProblemInjectorView.Designer.cs">
    122       <DependentUpon>StructIdProblemInjectorView.cs</DependentUpon>
    123     </Compile>
    124124    <Compile Include="Subtraction.cs" />
    125125    <Compile Include="SymbolicExpressionExporter.cs" />
    … …  
    187187      <DependentUpon>OffSpringSelectionGpEditor.cs</DependentUpon>
    188188    </EmbeddedResource>
     189    <EmbeddedResource Include="ProblemInjectorView.resx">
     190      <DependentUpon>ProblemInjectorView.cs</DependentUpon>
     191    </EmbeddedResource>
    189192    <EmbeddedResource Include="StandardGpEditor.resx">
    190193      <DependentUpon>StandardGpEditor.cs</DependentUpon>
    191       <SubType>Designer</SubType>
    192     </EmbeddedResource>
    193     <EmbeddedResource Include="StructIdProblemInjectorView.resx">
    194       <DependentUpon>StructIdProblemInjectorView.cs</DependentUpon>
    195194      <SubType>Designer</SubType>
    196195    </EmbeddedResource>

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

    r1249 r1252  
    3030
    3131namespace HeuristicLab.GP.StructureIdentification {
    32   public class StructIdProblemInjector : Core.OperatorBase {
     32  public class ProblemInjector : Core.OperatorBase {
    3333    public override string Description {
    3434      get { return @"Injects the necessary variables for a structure identification problem."; }
    3535    }
    3636
    37     public StructIdProblemInjector()
     37    public ProblemInjector()
    3838      : base() {
    3939      AddVariableInfo(new Core.VariableInfo("Dataset", "Dataset", typeof(Dataset), Core.VariableKind.New));
    … …  
    7575
    7676    public override Core.IView CreateView() {
    77       return new StructIdProblemInjectorView(this);
     77      return new ProblemInjectorView(this);
    7878    }
    7979

  • branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification/ProblemInjectorView.Designer.cs

    r1249 r1252  
    2121
    2222namespace HeuristicLab.GP.StructureIdentification {
    23   partial class StructIdProblemInjectorView {
     23  partial class ProblemInjectorView {
    2424    /// <summary>
    2525    /// Required designer variable.

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

    r1249 r1252  
    3333
    3434namespace HeuristicLab.GP.StructureIdentification {
    35   public partial class StructIdProblemInjectorView : ViewBase {
    36     public StructIdProblemInjector StructIdProblemInjector {
    37       get { return (StructIdProblemInjector)Item; }
     35  public partial class ProblemInjectorView : ViewBase {
     36    public ProblemInjector ProblemInjector {
     37      get { return (ProblemInjector)Item; }
    3838      set { base.Item = value; }
    3939    }
    4040
    41     public StructIdProblemInjectorView()
     41    public ProblemInjectorView()
    4242      : base() {
    4343      InitializeComponent();
    4444    }
    45     public StructIdProblemInjectorView(StructIdProblemInjector structIdProblemInjector)
     45    public ProblemInjectorView(ProblemInjector problemInjector)
    4646      : this() {
    47       StructIdProblemInjector = structIdProblemInjector;
    48       variablesView.Operator = structIdProblemInjector;
     47      ProblemInjector = problemInjector;
     48      variablesView.Operator = problemInjector;
    4949      variablesView.Update();
    5050    }
    … …  
    5757    protected override void AddItemEvents() {
    5858      base.AddItemEvents();
    59       operatorBaseVariableInfosView.Operator = StructIdProblemInjector;
    60       operatorBaseDescriptionView.Operator = StructIdProblemInjector;
     59      operatorBaseVariableInfosView.Operator = ProblemInjector;
     60      operatorBaseDescriptionView.Operator = ProblemInjector;
    6161    }
    6262
    6363    protected override void UpdateControls() {
    6464      base.UpdateControls();
    65       if (StructIdProblemInjector == null) {
     65      if (ProblemInjector == null) {
    6666        importInstanceButton.Enabled = false;
    6767      } else {
    68         Dataset dataset = (Dataset)StructIdProblemInjector.GetVariable("Dataset").Value;
     68        Dataset dataset = (Dataset)ProblemInjector.GetVariable("Dataset").Value;
    6969        datasetView.Dataset = dataset;
    7070        importInstanceButton.Enabled = true;
    … …  
    9494        }
    9595        if (success) {
    96           Dataset dataset = (Dataset)StructIdProblemInjector.GetVariable("Dataset").Value;
     96          Dataset dataset = (Dataset)ProblemInjector.GetVariable("Dataset").Value;
    9797          dataset.Rows = parser.Rows;
    9898          dataset.Columns = parser.Columns;
    … …  
    112112          TrySetVariable("TargetVariable", parser.TargetVariable);
    113113
    114           IVariable var = StructIdProblemInjector.GetVariable("AllowedFeatures");
     114          IVariable var = ProblemInjector.GetVariable("AllowedFeatures");
    115115          if (var != null) {
    116116            ItemList<IntData> allowedFeatures = (ItemList<IntData>)var.Value;
    … …  
    127127
    128128    private void TrySetVariable(string name, int value) {
    129       IVariable var = StructIdProblemInjector.GetVariable(name);
     129      IVariable var = ProblemInjector.GetVariable(name);
    130130      if (var != null) {
    131131        ((IntData)var.Value).Data = value;

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

    r1251 r1252  
    9090
    9191    protected internal override IOperator CreateProblemInjector() {
    92       return new StructIdProblemInjector();
     92      return new ProblemInjector();
    9393    }
    9494
Note: See TracChangeset for help on using the changeset viewer.