Changeset 2235 for trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols

Timestamp:

08/05/09 11:17:08 (15 years ago)

Author:

gkronber

Message:

Fixed #323 (The default representation of FunctionTreeView should show coefficients and time-offsets of variables and values of constants).

Location:

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols

Files:

• Addition.cs (modified) (1 diff)
• And.cs (modified) (1 diff)
• Average.cs (modified) (1 diff)
• ConstantFunctionTree.cs (modified) (3 diffs)
• Cosinus.cs (modified) (1 diff)
• Division.cs (modified) (1 diff)
• Equal.cs (modified) (1 diff)
• Exponential.cs (modified) (1 diff)
• GreaterThan.cs (modified) (1 diff)
• IfThenElse.cs (modified) (1 diff)
• LessThan.cs (modified) (1 diff)
• Logarithm.cs (modified) (1 diff)
• Multiplication.cs (modified) (1 diff)
• Not.cs (modified) (1 diff)
• Or.cs (modified) (1 diff)
• Power.cs (modified) (1 diff)
• Signum.cs (modified) (1 diff)
• Sinus.cs (modified) (1 diff)
• Sqrt.cs (modified) (1 diff)
• Subtraction.cs (modified) (1 diff)
• Tangens.cs (modified) (1 diff)
• VariableFunctionTree.cs (modified) (2 diffs)
• Xor.cs (modified) (1 diff)

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/Addition.cs

@@ -38 +38 @@
       MaxSubTrees = 3;
     }
+
+    public override HeuristicLab.GP.Interfaces.IFunctionTree GetTreeNode() {
+      return new FunctionTreeBase(this);
+    }
   }
 }

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/And.cs

@@ -35 +35 @@
       MinSubTrees = 2; MaxSubTrees = 3;
     }
+
+    public override HeuristicLab.GP.Interfaces.IFunctionTree GetTreeNode() {
+      return new FunctionTreeBase(this);
+    }
   }
 }

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/Average.cs

@@ -33 +33 @@
       MinSubTrees = 2; MaxSubTrees = 3;
     }
+
+    public override HeuristicLab.GP.Interfaces.IFunctionTree GetTreeNode() {
+      return new FunctionTreeBase(this);
+    }
   }
 }

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/ConstantFunctionTree.cs

@@ -30 +30 @@
     public double Value { get; set; }
 
-    public ConstantFunctionTree(Constant constant) : base(constant){
+    public ConstantFunctionTree(Constant constant)
+      : base(constant) {
     }
 
-    protected ConstantFunctionTree(ConstantFunctionTree original) : base(original){
+    protected ConstantFunctionTree(ConstantFunctionTree original)
+      : base(original) {
       Value = original.Value;
     }
@@ -57 +59 @@
     }
 
+    public override string ToString() {
+      return SymbolicExpressionExporter.GetName(this);
+    }
+
+    #region serialization
     public override object Clone() {
       return new ConstantFunctionTree(this);
@@ -73 +80 @@
       Value = XmlConvert.ToDouble(node.Attributes["Value"].Value);
     }
+    #endregion
 
     private IVariable CreateValueVariable() {

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/Cosinus.cs

@@ -30 +30 @@
       : base() {
     }
+
+    public override HeuristicLab.GP.Interfaces.IFunctionTree GetTreeNode() {
+      return new FunctionTreeBase(this);
+    }
   }
 }

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/Division.cs

@@ -37 +37 @@
 
     public Division() : base() { }
+
+    public override HeuristicLab.GP.Interfaces.IFunctionTree GetTreeNode() {
+      return new FunctionTreeBase(this);
+    }
   }
 }

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/Equal.cs

@@ -30 +30 @@
 
     public Equal() : base() { }
+
+    public override HeuristicLab.GP.Interfaces.IFunctionTree GetTreeNode() {
+      return new FunctionTreeBase(this);
+    }
   }
 }

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/Exponential.cs

@@ -28 +28 @@
 
     public Exponential() : base() { }
+
+    public override HeuristicLab.GP.Interfaces.IFunctionTree GetTreeNode() {
+      return new FunctionTreeBase(this);
+    }
   }
 }

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/GreaterThan.cs

@@ -31 +31 @@
     public GreaterThan() : base() { }
 
+    public override HeuristicLab.GP.Interfaces.IFunctionTree GetTreeNode() {
+      return new FunctionTreeBase(this);
+    }
   }
 }

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/IfThenElse.cs

@@ -34 +34 @@
       MinSubTrees = 3; MaxSubTrees = 3;
     }
+    
+    public override HeuristicLab.GP.Interfaces.IFunctionTree GetTreeNode() {
+      return new FunctionTreeBase(this);
+    }
   }
 }

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/LessThan.cs

@@ -32 +32 @@
       : base() {
     }
+
+    public override HeuristicLab.GP.Interfaces.IFunctionTree GetTreeNode() {
+      return new FunctionTreeBase(this);
+    }
   }
 }

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/Logarithm.cs

@@ -30 +30 @@
       : base() {
     }
+
+    public override HeuristicLab.GP.Interfaces.IFunctionTree GetTreeNode() {
+      return new FunctionTreeBase(this);
+    }
   }
 }

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/Multiplication.cs

@@ -37 +37 @@
       MinSubTrees = 2; MaxSubTrees = 3;
     }
+
+    public override HeuristicLab.GP.Interfaces.IFunctionTree GetTreeNode() {
+      return new FunctionTreeBase(this);
+    }
   }
 }

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/Not.cs

@@ -31 +31 @@
       : base() {
     }
+
+    public override HeuristicLab.GP.Interfaces.IFunctionTree GetTreeNode() {
+      return new FunctionTreeBase(this);
+    }
   }
 }

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/Or.cs

@@ -33 +33 @@
       MinSubTrees = 2; MaxSubTrees = 3;
     }
+    public override HeuristicLab.GP.Interfaces.IFunctionTree GetTreeNode() {
+      return new FunctionTreeBase(this);
+    }
   }
 }

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/Power.cs

@@ -30 +30 @@
       : base() {
     }
+
+    public override HeuristicLab.GP.Interfaces.IFunctionTree GetTreeNode() {
+      return new FunctionTreeBase(this);
+    }
   }
 }

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/Signum.cs

@@ -30 +30 @@
       : base() {
     }
+
+    public override HeuristicLab.GP.Interfaces.IFunctionTree GetTreeNode() {
+      return new FunctionTreeBase(this);
+    }
   }
 }

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/Sinus.cs

@@ -30 +30 @@
       : base() {
     }
+
+    public override HeuristicLab.GP.Interfaces.IFunctionTree GetTreeNode() {
+      return new FunctionTreeBase(this);
+    }
   }
 }

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/Sqrt.cs

@@ -30 +30 @@
       : base() {
     }
+
+    public override HeuristicLab.GP.Interfaces.IFunctionTree GetTreeNode() {
+      return new FunctionTreeBase(this);
+    }
   }
 }

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/Subtraction.cs

@@ -35 +35 @@
       : base() {
     }
+
+    public override HeuristicLab.GP.Interfaces.IFunctionTree GetTreeNode() {
+      return new FunctionTreeBase(this);
+    }
   }
 }

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/Tangens.cs

@@ -30 +30 @@
       : base() {
     }
+
+    public override HeuristicLab.GP.Interfaces.IFunctionTree GetTreeNode() {
+      return new FunctionTreeBase(this);
+    }
   }
 }

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/VariableFunctionTree.cs

@@ -67 +67 @@
     }
 
+    public override string ToString() {
+      return SymbolicExpressionExporter.GetName(this);
+    }
+
+    #region serialization
     public override object Clone() {
       return new VariableFunctionTree(this);
@@ -91 +96 @@
       VariableName = node.Attributes["Variable"].Value;
     }
+    #endregion
 
     private IVariable CreateSampleOffsetVariable() {

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/Xor.cs

@@ -32 +32 @@
       : base() {
     }
+
+    public override HeuristicLab.GP.Interfaces.IFunctionTree GetTreeNode() {
+      return new FunctionTreeBase(this);
+    }
   }
 }