Free cookie consent management tool by TermsFeed Policy Generator

Changeset 4968


Ignore:
Timestamp:
11/28/10 11:06:46 (14 years ago)
Author:
gkronber
Message:

Moved graphviz formatter into symbolic expression tree encoding plugin. #1270

Location:
branches/DataAnalysis.Extensions
Files:
1 added
3 edited
2 moved

Legend:

Unmodified
Added
Removed

  • branches/DataAnalysis.Extensions/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.3/SymbolicExpressionView.cs

    r4842 r4968  
    2525using HeuristicLab.PluginInfrastructure;
    2626using System.Collections.Generic;
     27using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Formatters;
    2728
    2829namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views {

  • branches/DataAnalysis.Extensions/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Formatters/SymbolicExpressionTreeGraphvizFormatter.cs

    r4961 r4968  
    2727using HeuristicLab.Common;
    2828
    29 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Formatters {
    30   [Item("SymbolicExpressionTreeGraphvizFormatter", "Formatter for symbolic expression trees for import into GraphViz documents.")]
     29namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Formatters {
     30  [Item("GraphViz String Formatter", "Formatter for symbolic expression trees for visualization with GraphViz.")]
    3131  public sealed class SymbolicExpressionTreeGraphvizFormatter : NamedItem, ISymbolicExpressionTreeStringFormatter {
    3232    public bool Indent { get; set; }
    3333
    3434    private readonly static Dictionary<string, string> symbolNameMap = new Dictionary<string, string>() {
    35       {"Multiplication", "Mul"},
    36       {"Addition", "Add"},
    37       {"Division", "Div"},
    38       {"Subtraction", "Sub"},
    39       {"Average", "Avg"},
    40      
    41       {"Logarithm", "Log"},
    42       {"Exponential", "Exp"},
    43 
    44       {"Cosine", "Cos"},
    45       {"Sine", "Sin"},
    46       {"Tangent", "Tan"},
    47 
    48       {"GreaterThan", ">"},
    49       {"LessThan", "<"},
    50       {"IfThenElse", "If"},
    51 
    5235      // match Koza style
    5336      {"ProgramRootSymbol", "Prog"},
    … …  
    5639
    5740    public SymbolicExpressionTreeGraphvizFormatter()
    58       : base("SymbolicExpressionTreeLatexFormatter", "Formatter for symbolic expression trees for import into LaTeX documents.") {
     41      : base("GraphViz String Formatter", "Formatter for symbolic expression trees for visualization with GraphViz.") {
    5942      Indent = true;
    6043    }

  • branches/DataAnalysis.Extensions/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Formatters/SymbolicExpressionTreeStringFormatter.cs

    r4961 r4968  
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2626
    27 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
     27namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Formatters {
    2828
    2929  [Item("SymbolicExpressionTreeStringFormatter", "The default string formatter for symbolic expression trees.")]

  • branches/DataAnalysis.Extensions/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj

    r4820 r4968  
    160160    <Compile Include="Compiler\Instruction.cs" />
    161161    <Compile Include="Compiler\SymbolicExpressionTreeCompiler.cs" />
     162    <Compile Include="Formatters\SymbolicExpressionTreeGraphvizFormatter.cs" />
     163    <Compile Include="Formatters\SymbolicExpressionTreeStringFormatter.cs" />
    162164    <Compile Include="Interfaces\ISymbolicExpressionTreeStringFormatter.cs" />
    163165    <Compile Include="Creators\SymbolicExpressionTreeCreator.cs" />
    … …  
    176178    <Compile Include="Manipulators\SymbolicExpressionTreeManipulator.cs" />
    177179    <Compile Include="SymbolicExpressionTreeGrammar.cs" />
    178     <Compile Include="SymbolicExpressionTreeStringFormatter.cs" />
    179180    <Compile Include="SymbolicExpressionTreeTopLevelNode.cs" />
    180181    <Compile Include="Crossovers\SubtreeCrossover.cs">

  • branches/DataAnalysis.Extensions/HeuristicLab.Problems.DataAnalysis/3.3/HeuristicLab.Problems.DataAnalysis-3.3.csproj

    r4900 r4968  
    198198    <Compile Include="SupportVectorMachine\SupportVectorMachineUtil.cs" />
    199199    <Compile Include="Symbolic\ArithmeticExpressionGrammar.cs" />
    200     <Compile Include="Symbolic\Formatters\SymbolicExpressionTreeGraphvizFormatter.cs" />
    201200    <Compile Include="Symbolic\Formatters\SymbolicExpressionTreeLatexFormatter.cs" />
    202201    <Compile Include="Symbolic\Formatters\SymbolicExpressionTreeSmalltalkStringFormatter.cs" />
Note: See TracChangeset for help on using the changeset viewer.