Changeset 2216 for branches/GP-Refactoring-713/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols

Timestamp:

07/30/09 19:41:58 (15 years ago)

Author:

gkronber

Message:

GP Refactoring #713

• cleaned code
• reintegrated GP.Boolean and GP.SantaFe
• worked on serialization of function trees

Location:

branches/GP-Refactoring-713/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols

Files:

• Constant.cs (modified) (1 diff)
• ConstantFunctionTree.cs (modified) (1 diff)
• VariableFunctionTree.cs (modified) (2 diffs)

branches/GP-Refactoring-713/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/Constant.cs

@@ -31 +31 @@
     public override string Description {
       get { return "Returns the value of local variable 'Value'."; }
-    }
-
-    public override IEnumerable<string> LocalParameterNames {
-      get {
-        return new string[] { VALUE };
-      }
     }
 

branches/GP-Refactoring-713/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/ConstantFunctionTree.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.GP.StructureIdentification {
-  public class ConstantFunctionTree : FunctionTreeBase {
-    private static readonly IList<IFunctionTree> subTrees = new List<IFunctionTree>().AsReadOnly();
+  public class ConstantFunctionTree : TerminalTreeNode {
     public double Value { get; set; }
 
-    public ConstantFunctionTree(Constant constant) {
-      Function = constant;
+    public ConstantFunctionTree(Constant constant) : base(constant){
     }
 
-    protected ConstantFunctionTree(ConstantFunctionTree original) {
-      Function = original.Function;
+    protected ConstantFunctionTree(ConstantFunctionTree original) : base(original){
       Value = original.Value;
-    }
-
-    public override IList<IFunctionTree> SubTrees {
-      get {
-        return subTrees;
-      }
     }
 

branches/GP-Refactoring-713/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/VariableFunctionTree.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.GP.StructureIdentification {
-  public class VariableFunctionTree : FunctionTreeBase {
-    private static readonly IList<IFunctionTree> subTrees = new List<IFunctionTree>().AsReadOnly();
+  public class VariableFunctionTree : TerminalTreeNode {
     public double Weight { get; set; }
     public string VariableName { get; set; }
     public int SampleOffset { get; set; }
 
-    public VariableFunctionTree(Variable variable) {
-      Function = variable;
+    public VariableFunctionTree(Variable variable)
+      : base(variable) {
     }
 
-    protected VariableFunctionTree(VariableFunctionTree original) {
-      Function = original.Function;
+    protected VariableFunctionTree(VariableFunctionTree original)
+      : base(original) {
       Weight = original.Weight;
       VariableName = original.VariableName;
       SampleOffset = original.SampleOffset;
-    }
-
-    public override IList<IFunctionTree> SubTrees {
-      get {
-        return subTrees;
-      }
     }
 
@@ -66 +59 @@
     public override IOperation CreateInitOperation(IScope scope) {
       Scope myVariableScope = new Scope();
-      scope.AddSubScope(myVariableScope); 
+      scope.AddSubScope(myVariableScope);
       myVariableScope.AddVariable(CreateWeightVariable());
       myVariableScope.AddVariable(CreateVariableNameVariable());