Changeset 4900 for branches/DataAnalysis.Extensions

Timestamp:

11/22/10 11:09:28 (14 years ago)

Author:

gkronber

Message:

Added string formatters for GraphViz and LaTex formats.
Set svn:ignore properties. #1270

Location:

branches/DataAnalysis.Extensions

Files:

• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.3 (modified) (1 prop)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3 (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis/3.3 (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis/3.3/HeuristicLab.Problems.DataAnalysis-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Formatters/SymbolicExpressionTreeGraphvizFormatter.cs (copied) (copied from branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Views/3.3/Symbolic/SymbolicExpressionTreeGraphvizFormatter.cs) (2 diffs)
• HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Formatters/SymbolicExpressionTreeLatexFormatter.cs (copied) (copied from branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Views/3.3/Symbolic/SymbolicExpressionTreeLatexFormatter.cs) (4 diffs)

branches/DataAnalysis.Extensions/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.3

@@ -1 +1 @@
 HeuristicLabEncodingsSymbolicExpressionTreeEncodingViewsPlugin.cs
+bin
+obj

@@ -1 +1 @@
 HeuristicLabEncodingsSymbolicExpressionTreeEncodingViewsPlugin.cs
+bin
+obj

branches/DataAnalysis.Extensions/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3

@@ -1 +1 @@
 HeuristicLabEncodingsSymbolicExpressionTreeEncodingPlugin.cs
+bin
+obj

@@ -1 +1 @@
 HeuristicLabEncodingsSymbolicExpressionTreeEncodingPlugin.cs
+bin
+obj

branches/DataAnalysis.Extensions/HeuristicLab.Problems.DataAnalysis/3.3

@@ -1 +1 @@
 HeuristicLabProblemsDataAnalysisPlugin.cs
+bin
+*.user
+obj

@@ -1 +1 @@
 HeuristicLabProblemsDataAnalysisPlugin.cs
+bin
+*.user
+obj

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

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
@@ -198 +198 @@
     <Compile Include="SupportVectorMachine\SupportVectorMachineUtil.cs" />
     <Compile Include="Symbolic\ArithmeticExpressionGrammar.cs" />
+    <Compile Include="Symbolic\Formatters\SymbolicExpressionTreeGraphvizFormatter.cs" />
+    <Compile Include="Symbolic\Formatters\SymbolicExpressionTreeLatexFormatter.cs" />
     <Compile Include="Symbolic\Formatters\SymbolicExpressionTreeSmalltalkStringFormatter.cs" />
     <Compile Include="Symbolic\FullFunctionalExpressionGrammar.cs" />

branches/DataAnalysis.Extensions/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Formatters/SymbolicExpressionTreeGraphvizFormatter.cs

@@ -24 +24 @@
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using System.Collections.Generic;
+using HeuristicLab.Core;
+using HeuristicLab.Common;
 
-namespace HeuristicLab.Problems.DataAnalysis.Views.Symbolic {
+namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Formatters {
   [StorableClass]
-  public class SymbolicExpressionTreeGraphvizFormatter {
+  [Item("SymbolicExpressionTreeGraphvizFormatter", "Formatter for symbolic expression trees for import into GraphViz documents.")]
+  public sealed class SymbolicExpressionTreeGraphvizFormatter : NamedItem, ISymbolicExpressionTreeStringFormatter {
     [Storable]
     public bool Indent { get; set; }
@@ -55 +58 @@
 
 
+    [StorableConstructor]
+    private SymbolicExpressionTreeGraphvizFormatter(bool deserializing) : base(deserializing) { }
     public SymbolicExpressionTreeGraphvizFormatter()
-      : base() {
+      : base("SymbolicExpressionTreeLatexFormatter", "Formatter for symbolic expression trees for import into LaTeX documents.") {
       Indent = true;
+    }
+    private SymbolicExpressionTreeGraphvizFormatter(SymbolicExpressionTreeGraphvizFormatter original, Cloner cloner)
+      : base(original, cloner) {
+      this.Indent = original.Indent;
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new SymbolicExpressionTreeGraphvizFormatter(this, cloner);
     }
 

branches/DataAnalysis.Extensions/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Formatters/SymbolicExpressionTreeLatexFormatter.cs

@@ -28 +28 @@
 using System;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Symbols;
+using HeuristicLab.Core;
+using HeuristicLab.Common;
 
-namespace HeuristicLab.Problems.DataAnalysis.Views.Symbolic {
-  public class SymbolicExpressionTreeLatexFormatter {
+namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Formatters {
+  [Item("SymbolicExpressionTreeLatexFormatter", "Formatter for symbolic expression trees for import into LaTeX documents.")]
+  public sealed class SymbolicExpressionTreeLatexFormatter : NamedItem, ISymbolicExpressionTreeStringFormatter {
+    [StorableConstructor]
+    private SymbolicExpressionTreeLatexFormatter(bool deserializing) : base(deserializing) { }
     public SymbolicExpressionTreeLatexFormatter()
-      : base() { }
+      : base("SymbolicExpressionTreeLatexFormatter", "Formatter for symbolic expression trees for import into LaTeX documents.") { }
+    private SymbolicExpressionTreeLatexFormatter(SymbolicExpressionTreeLatexFormatter original, Cloner cloner) : base(original, cloner) { }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new SymbolicExpressionTreeLatexFormatter(this, cloner);
+    }
 
     public string Format(SymbolicExpressionTree symbolicExpressionTree) {
@@ -77 +87 @@
       } else if (node.Symbol is Constant) {
         strBuilder.Append(" c ");
-      } else if (node.Symbol is Variable) {
+      } else if (node.Symbol is HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols.Variable) {
         var varNode = node as VariableTreeNode;
-        strBuilder.Append(" " + varNode.ToString()+ " ");
+        strBuilder.Append(" " + varNode.ToString() + " ");
       } else if (node.Symbol is ProgramRootSymbol) {
       } else if (node.Symbol is Defun) {
@@ -89 +99 @@
       } else if (node.Symbol is StartSymbol) {
         strBuilder.Append("Result & = & ");
-      } else if(node.Symbol is Argument) {
+      } else if (node.Symbol is Argument) {
         var argSym = node.Symbol as Argument;
-        strBuilder.Append(" ARG+"+argSym.ArgumentIndex+" ");
+        strBuilder.Append(" ARG+" + argSym.ArgumentIndex + " ");
       } else {
         throw new NotImplementedException("Export of " + node.Symbol + " is not implemented.");
@@ -126 +136 @@
         strBuilder.Append(" } ");
       } else if (node.Symbol is Constant) {
-      } else if (node.Symbol is Variable) {
+      } else if (node.Symbol is HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols.Variable) {
       } else if (node.Symbol is ProgramRootSymbol) {
       } else if (node.Symbol is Defun) {

@@ -1 +1 @@
 HeuristicLabEncodingsSymbolicExpressionTreeEncodingViewsPlugin.cs
+bin
+obj

@@ -1 +1 @@
 HeuristicLabEncodingsSymbolicExpressionTreeEncodingPlugin.cs
+bin
+obj

@@ -1 +1 @@
 HeuristicLabProblemsDataAnalysisPlugin.cs
+bin
+*.user
+obj