Free cookie consent management tool by TermsFeed Policy Generator

Changeset 2361


Ignore:
Timestamp:
09/15/09 16:36:48 (15 years ago)
Author:
gkronber
Message:

Fixed #742 (Consistent naming scheme for data-modeling engines).

Location:
trunk/sources
Files:
5 edited
7 moved

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.GP.Algorithms/3.2/AlgorithmBase.cs

    r2341 r2361  
    132132    protected internal virtual CombinedOperator CreateAlgorithm() {
    133133      CombinedOperator algo = new CombinedOperator();
    134       algo.Name = "GP";
    135       SequentialProcessor seq = new SequentialProcessor();
     134      algo.Name = Name;
     135      SequentialProcessor seq = new SequentialProcessor();
     136      seq.Name = Name;
    136137      IOperator init = CreateInitializationOperator();
    137138      init.AddSubOperator(CreateProblemInjector());

  • trunk/sources/HeuristicLab.GP.StructureIdentification.Classification/3.3/HeuristicLab.GP.StructureIdentification.Classification-3.3.csproj

    r2356 r2361  
    8686    <Compile Include="MulticlassModeller.cs" />
    8787    <Compile Include="MulticlassOneVsOneAnalyzer.cs" />
    88     <Compile Include="OffspringSelectionGP.cs" />
     88    <Compile Include="OffspringSelectionGPClassification.cs" />
    8989    <Compile Include="Properties\AssemblyInfo.cs" />
    9090    <Compile Include="ROCAnalyzer.cs" />
    91     <Compile Include="StandardGP.cs" />
     91    <Compile Include="StandardGPClassification.cs" />
    9292  </ItemGroup>
    9393  <ItemGroup>

  • trunk/sources/HeuristicLab.GP.StructureIdentification.Classification/3.3/OffspringSelectionGPClassification.cs

    r2356 r2361  
    2626
    2727namespace HeuristicLab.GP.StructureIdentification.Classification {
    28   public class OffspringSelectionGP : HeuristicLab.GP.StructureIdentification.OffspringSelectionGP, IClassificationAlgorithm {
     28  public class OffspringSelectionGPClassification : HeuristicLab.GP.StructureIdentification.OffspringSelectionGPRegression, IClassificationAlgorithm {
    2929
    3030    public override string Name {

  • trunk/sources/HeuristicLab.GP.StructureIdentification.Classification/3.3/StandardGPClassification.cs

    r2356 r2361  
    2626
    2727namespace HeuristicLab.GP.StructureIdentification.Classification {
    28   public class StandardGP : HeuristicLab.GP.StructureIdentification.StandardGP, IClassificationAlgorithm {
     28  public class StandardGPClassification : HeuristicLab.GP.StructureIdentification.StandardGPRegression, IClassificationAlgorithm {
    2929    public override string Name {
    3030      get {

  • trunk/sources/HeuristicLab.GP.StructureIdentification.TimeSeries/3.3/HeuristicLab.GP.StructureIdentification.TimeSeries-3.3.csproj

    r2356 r2361  
    8484    <Compile Include="AveragePercentageChangeEvaluator.cs" />
    8585    <Compile Include="HeuristicLabGPTimeSeriesPlugin.cs" />
    86     <Compile Include="OffspringSelectionGP.cs" />
     86    <Compile Include="OffspringSelectionGPTimeSeriesPrognosis.cs" />
    8787    <Compile Include="ProfitEvaluator.cs" />
    8888    <Compile Include="Properties\AssemblyInfo.cs" />
    89     <Compile Include="StandardGP.cs" />
     89    <Compile Include="StandardGPTimeSeriesPrognosis.cs" />
    9090  </ItemGroup>
    9191  <ItemGroup>

  • trunk/sources/HeuristicLab.GP.StructureIdentification.TimeSeries/3.3/OffspringSelectionGPTimeSeriesPrognosis.cs

    r2356 r2361  
    2828
    2929namespace HeuristicLab.GP.StructureIdentification.TimeSeries {
    30   public class OffspringSelectionGP : HeuristicLab.GP.StructureIdentification.OffspringSelectionGP, ITimeSeriesAlgorithm {
     30  public class OffspringSelectionGPTimeSeriesPrognosis : HeuristicLab.GP.StructureIdentification.OffspringSelectionGPRegression, ITimeSeriesAlgorithm {
    3131    public override string Name {
    3232      get {

  • trunk/sources/HeuristicLab.GP.StructureIdentification.TimeSeries/3.3/StandardGPTimeSeriesPrognosis.cs

    r2356 r2361  
    2828
    2929namespace HeuristicLab.GP.StructureIdentification.TimeSeries {
    30   public class StandardGP : HeuristicLab.GP.StructureIdentification.StandardGP, ITimeSeriesAlgorithm {
     30  public class StandardGPTimeSeriesPrognosis : HeuristicLab.GP.StructureIdentification.StandardGPRegression, ITimeSeriesAlgorithm {
    3131    public override string Name {
    3232      get {

  • trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/HeuristicLab.GP.StructureIdentification-3.3.csproj

    r2341 r2361  
    8787    <Compile Include="HL3TreeEvaluatorInjector.cs" />
    8888    <Compile Include="HL2TreeEvaluatorInjector.cs" />
    89     <Compile Include="OffspringSelectionGP.cs" />
     89    <Compile Include="OffspringSelectionGPRegression.cs" />
    9090    <Compile Include="PredictorBuilder.cs" />
    9191    <Compile Include="Predictor.cs" />
    … …  
    9898      <DependentUpon>PredictorView.cs</DependentUpon>
    9999    </Compile>
    100     <Compile Include="StandardGP.cs">
    101       <SubType>Code</SubType>
    102     </Compile>
     100    <Compile Include="StandardGPRegression.cs" />
    103101    <Compile Include="Symbols\Addition.cs" />
    104102    <Compile Include="Symbols\And.cs" />

  • trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/OffspringSelectionGPRegression.cs

    r2356 r2361  
    3333
    3434namespace HeuristicLab.GP.StructureIdentification {
    35   public class OffspringSelectionGP : HeuristicLab.GP.Algorithms.OffspringSelectionGP, IAlgorithm {
     35  public class OffspringSelectionGPRegression : HeuristicLab.GP.Algorithms.OffspringSelectionGP, IAlgorithm {
    3636    public override string Name { get { return "OffspringSelectionGP - StructureIdentification"; } }
    3737
    … …  
    7171    }
    7272
    73     public OffspringSelectionGP()
     73    public OffspringSelectionGPRegression()
    7474      : base() {
    7575      PunishmentFactor = 10.0;
    … …  
    154154    }
    155155
    156     public override object Clone(IDictionary<Guid, object> clonedObjects) {
    157       OffspringSelectionGP clone = (OffspringSelectionGP)base.Clone(clonedObjects);
    158       clone.PunishmentFactor = PunishmentFactor;
    159       return clone;
    160     }
    161 
    162156    protected CombinedOperator GetProblemInjector() {
    163157      return (CombinedOperator)GetInitializationOperator().SubOperators[0];

  • trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/StandardGPRegression.cs

    r2356 r2361  
    3232
    3333namespace HeuristicLab.GP.StructureIdentification {
    34   public class StandardGP : HeuristicLab.GP.Algorithms.StandardGP, IAlgorithm {
     34  public class StandardGPRegression : HeuristicLab.GP.Algorithms.StandardGP, IAlgorithm {
    3535
    3636    public override string Name { get { return "StandardGP - StructureIdentification"; } }
    … …  
    7171    }
    7272
    73     public StandardGP()
     73    public StandardGPRegression()
    7474      : base() {
    7575
    … …  
    153153    }
    154154
    155     public override object Clone(IDictionary<Guid, object> clonedObjects) {
    156       StandardGP clone = (StandardGP)base.Clone(clonedObjects);
    157       clone.PunishmentFactor = PunishmentFactor;
    158       return clone;
    159     }
    160 
    161155    protected CombinedOperator GetProblemInjector() {
    162156      return (CombinedOperator)GetInitializationOperator().SubOperators[0];

  • trunk/sources/HeuristicLab.SupportVectorMachines/3.2/HeuristicLab.SupportVectorMachines-3.2.csproj

    r2351 r2361  
    8484  <ItemGroup>
    8585    <Compile Include="SupportVectorClassification.cs" />
    86     <Compile Include="TimeSeriesSupportVectorRegression.cs" />
     86    <Compile Include="SupportVectorTimeSeriesPrognosis.cs" />
    8787    <Compile Include="PredictorView.cs">
    8888      <SubType>UserControl</SubType>

  • trunk/sources/HeuristicLab.SupportVectorMachines/3.2/SupportVectorTimeSeriesPrognosis.cs

    r2356 r2361  
    3737
    3838namespace HeuristicLab.SupportVectorMachines {
    39   public class TimeSeriesSupportVectorRegression : SupportVectorRegression, ITimeSeriesAlgorithm {
     39  public class SupportVectorTimeSeriesPrognosis : SupportVectorRegression, ITimeSeriesAlgorithm {
    4040
    4141    public override string Name { get { return "SupportVectorRegression - Time Series Prognosis"; } }
    … …  
    5151    }
    5252
    53     public TimeSeriesSupportVectorRegression()
     53    public SupportVectorTimeSeriesPrognosis()
    5454      : base() {
    55       MaxTimeOffset = 0;
    56       MinTimeOffset = 0;
     55      MaxTimeOffset = -1;
     56      MinTimeOffset = -1;
    5757    }
    5858
Note: See TracChangeset for help on using the changeset viewer.