Changeset 2361 for trunk/sources/HeuristicLab.GP.StructureIdentification/3.3

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/HeuristicLab.GP.StructureIdentification/3.3

Files:

• HeuristicLab.GP.StructureIdentification-3.3.csproj (modified) (2 diffs)
• OffspringSelectionGPRegression.cs (moved) (moved from trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/OffspringSelectionGP.cs) (3 diffs)
• StandardGPRegression.cs (moved) (moved from trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/StandardGP.cs) (3 diffs)

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

@@ -87 +87 @@
     <Compile Include="HL3TreeEvaluatorInjector.cs" />
     <Compile Include="HL2TreeEvaluatorInjector.cs" />
-    <Compile Include="OffspringSelectionGP.cs" />
+    <Compile Include="OffspringSelectionGPRegression.cs" />
     <Compile Include="PredictorBuilder.cs" />
     <Compile Include="Predictor.cs" />
@@ -98 +98 @@
       <DependentUpon>PredictorView.cs</DependentUpon>
     </Compile>
-    <Compile Include="StandardGP.cs">
-      <SubType>Code</SubType>
-    </Compile>
+    <Compile Include="StandardGPRegression.cs" />
     <Compile Include="Symbols\Addition.cs" />
     <Compile Include="Symbols\And.cs" />

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

@@ -33 +33 @@
 
 namespace HeuristicLab.GP.StructureIdentification {
-  public class OffspringSelectionGP : HeuristicLab.GP.Algorithms.OffspringSelectionGP, IAlgorithm {
+  public class OffspringSelectionGPRegression : HeuristicLab.GP.Algorithms.OffspringSelectionGP, IAlgorithm {
     public override string Name { get { return "OffspringSelectionGP - StructureIdentification"; } }
 
@@ -71 +71 @@
     }
 
-    public OffspringSelectionGP()
+    public OffspringSelectionGPRegression()
       : base() {
       PunishmentFactor = 10.0;
@@ -154 +154 @@
     }
 
-    public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      OffspringSelectionGP clone = (OffspringSelectionGP)base.Clone(clonedObjects);
-      clone.PunishmentFactor = PunishmentFactor;
-      return clone;
-    }
-
     protected CombinedOperator GetProblemInjector() {
       return (CombinedOperator)GetInitializationOperator().SubOperators[0];

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

@@ -32 +32 @@
 
 namespace HeuristicLab.GP.StructureIdentification {
-  public class StandardGP : HeuristicLab.GP.Algorithms.StandardGP, IAlgorithm {
+  public class StandardGPRegression : HeuristicLab.GP.Algorithms.StandardGP, IAlgorithm {
 
     public override string Name { get { return "StandardGP - StructureIdentification"; } }
@@ -71 +71 @@
     }
 
-    public StandardGP()
+    public StandardGPRegression()
       : base() {
 
@@ -153 +153 @@
     }
 
-    public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      StandardGP clone = (StandardGP)base.Clone(clonedObjects);
-      clone.PunishmentFactor = PunishmentFactor;
-      return clone;
-    }
-
     protected CombinedOperator GetProblemInjector() {
       return (CombinedOperator)GetInitializationOperator().SubOperators[0];