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

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

Files:

• BaseClasses (added)
• BaseClasses/AlgorithmBase.cs (moved) (moved from trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/AlgorithmBase.cs)
• BaseClasses/FunctionTreeBase.cs (added)
• BaseClasses/TreeEvaluatorBase.cs (moved) (moved from trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/TreeEvaluatorBase.cs)
• HeuristicLab.GP.StructureIdentification-3.3.csproj (modified) (1 diff)
• ModelAnalyzerExporter.cs (modified) (4 diffs)
• SymbolicExpressionExporter.cs (modified) (4 diffs)
• Symbols/Addition.cs (modified) (1 diff)
• Symbols/And.cs (modified) (1 diff)
• Symbols/Average.cs (modified) (1 diff)
• Symbols/ConstantFunctionTree.cs (modified) (3 diffs)
• Symbols/Cosinus.cs (modified) (1 diff)
• Symbols/Division.cs (modified) (1 diff)
• Symbols/Equal.cs (modified) (1 diff)
• Symbols/Exponential.cs (modified) (1 diff)
• Symbols/GreaterThan.cs (modified) (1 diff)
• Symbols/IfThenElse.cs (modified) (1 diff)
• Symbols/LessThan.cs (modified) (1 diff)
• Symbols/Logarithm.cs (modified) (1 diff)
• Symbols/Multiplication.cs (modified) (1 diff)
• Symbols/Not.cs (modified) (1 diff)
• Symbols/Or.cs (modified) (1 diff)
• Symbols/Power.cs (modified) (1 diff)
• Symbols/Signum.cs (modified) (1 diff)
• Symbols/Sinus.cs (modified) (1 diff)
• Symbols/Sqrt.cs (modified) (1 diff)
• Symbols/Subtraction.cs (modified) (1 diff)
• Symbols/Tangens.cs (modified) (1 diff)
• Symbols/VariableFunctionTree.cs (modified) (2 diffs)
• Symbols/Xor.cs (modified) (1 diff)

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

@@ -83 +83 @@
   <ItemGroup>
     <Compile Include="AlgorithmBase.cs" />
+    <Compile Include="BaseClasses\FunctionTreeBase.cs" />
     <Compile Include="Evaluators\SimpleGPEvaluatorBase.cs" />
     <Compile Include="HL3TreeEvaluator.cs" />

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

@@ -24 +24 @@
 
 namespace HeuristicLab.GP.StructureIdentification {
-  public class ModelAnalyzerExporter : IFunctionTreeSerializer, IFunctionTreeNameGenerator {
+  public class ModelAnalyzerExporter : IFunctionTreeSerializer {
     #region IFunctionTreeExporter Members
 
@@ -73 +73 @@
     #endregion
 
-    private string ExportFunction(IFunction function, IFunctionTree tree) {
+    private static string ExportFunction(IFunction function, IFunctionTree tree) {
       // this is smelly, if there is a cleaner way to have a 'dynamic' visitor 
       // please let me know! (gkronber 14.10.2008)
@@ -103 +103 @@
     }
 
-    #region IFunctionTreeNameGenerator Members
-
-    string IFunctionTreeNameGenerator.Name {
-      get { return "HL2 Representation"; }
-    }
-
-    public string GetName(IFunctionTree tree) {
+    public static string GetName(IFunctionTree tree) {
       string name = "";
       try {
@@ -118 +112 @@
       return name;
     }
-
-    #endregion
-
-
   }
 

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

@@ -26 +26 @@
 
 namespace HeuristicLab.GP.StructureIdentification {
-  public class SymbolicExpressionExporter : IFunctionTreeSerializer, IFunctionTreeNameGenerator {
+  public class SymbolicExpressionExporter : IFunctionTreeSerializer {
     private StringBuilder builder;
     private string currentIndent;
@@ -66 +66 @@
     }
 
-    private string ExportFunction(IFunction function, IFunctionTree tree) {
+    private static string ExportFunction(IFunction function, IFunctionTree tree) {
       // this is smelly, if there is a cleaner way to have a 'dynamic' visitor 
       // please let me know! (gkronber 14.10.2008)
@@ -99 +99 @@
     #endregion
 
-    #region IFunctionTreeNameGenerator Members
-
-    string IFunctionTreeNameGenerator.Name {
-      get { return "Symbolic Expression"; }
-    }
-
-    public string GetName(IFunctionTree tree) {
+    public static string GetName(IFunctionTree tree) {
       string name = "";
       try {
         name = ExportFunction(tree.Function, tree);
-      } catch(UnknownFunctionException) {
+      }
+      catch (UnknownFunctionException) {
         name = "N/A";
       }
@@ -115 +110 @@
     }
 
-    #endregion
+    //public string GetName(IFunctionTree tree) {
+    //  return SymbolicExpressionExporter.GetName(tree);
+    //}
   }
 

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);
+    }
   }
 }