Changeset 519 for trunk/sources/HeuristicLab.Functions

Timestamp:

08/18/08 15:55:32 (16 years ago)

Author:

gkronber

Message:

implemented #259 (BakedFunctionTree should provide an appropriate ToString() method)

Location:

trunk/sources/HeuristicLab.Functions

Files:

• BakedFunctionTree.cs (modified) (1 diff)
• FunctionView.Designer.cs (modified) (3 diffs)
• FunctionView.cs (modified) (1 diff)
• HeuristicLab.Functions.csproj (modified) (1 diff)
• SymbolicExpressionExporter.cs (added)

trunk/sources/HeuristicLab.Functions/BakedFunctionTree.cs

@@ -344 +344 @@
       return new FunctionTreeView(this);
     }
+
+    public override string ToString() {
+      SymbolicExpressionExporter exporter = new SymbolicExpressionExporter();
+      exporter.Visit(this);
+      return exporter.GetStringRepresentation();
+    }
   }
 }

trunk/sources/HeuristicLab.Functions/FunctionView.Designer.cs

@@ -60 +60 @@
       this.treeNodeContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
       this.copyToClipboardMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+      this.copyToClipboardSExpressionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
       this.splitContainer.Panel1.SuspendLayout();
       this.splitContainer.Panel2.SuspendLayout();
@@ -167 +168 @@
       // 
       this.treeNodeContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.copyToClipboardMenuItem});
+            this.copyToClipboardMenuItem,
+            this.copyToClipboardSExpressionToolStripMenuItem});
       this.treeNodeContextMenu.Name = "treeNodeContextMenu";
-      this.treeNodeContextMenu.Size = new System.Drawing.Size(248, 26);
+      this.treeNodeContextMenu.Size = new System.Drawing.Size(259, 70);
       // 
       // copyToClipboardMenuItem
       // 
       this.copyToClipboardMenuItem.Name = "copyToClipboardMenuItem";
-      this.copyToClipboardMenuItem.Size = new System.Drawing.Size(247, 22);
+      this.copyToClipboardMenuItem.Size = new System.Drawing.Size(258, 22);
       this.copyToClipboardMenuItem.Text = "Copy to clip-board (Model-Analyzer)";
       this.copyToClipboardMenuItem.Click += new System.EventHandler(this.copyToClipboardMenuItem_Click);
+      // 
+      // copyToClipboardSExpressionToolStripMenuItem
+      // 
+      this.copyToClipboardSExpressionToolStripMenuItem.Name = "copyToClipboardSExpressionToolStripMenuItem";
+      this.copyToClipboardSExpressionToolStripMenuItem.Size = new System.Drawing.Size(258, 22);
+      this.copyToClipboardSExpressionToolStripMenuItem.Text = "Copy to clip-board (S-Expression)";
+      this.copyToClipboardSExpressionToolStripMenuItem.Click += new System.EventHandler(this.copyToClipboardSExpressionToolStripMenuItem_Click);
       // 
       // FunctionTreeView
@@ -209 +218 @@
     private System.Windows.Forms.ContextMenuStrip treeNodeContextMenu;
     private System.Windows.Forms.ToolStripMenuItem copyToClipboardMenuItem;
+    private System.Windows.Forms.ToolStripMenuItem copyToClipboardSExpressionToolStripMenuItem;
 
   }

trunk/sources/HeuristicLab.Functions/FunctionView.cs

@@ -139 +139 @@
       Clipboard.SetText(visitor.ModelAnalyzerPrefix);
     }
+
+    private void copyToClipboardSExpressionToolStripMenuItem_Click(object sender, EventArgs e) {
+      TreeNode node = funTreeView.SelectedNode;
+      if(node == null || node.Tag == null) return;
+
+      string sexp = ((IFunctionTree)node.Tag).ToString();
+      Clipboard.SetText(sexp);
+    }
+
     private void funTreeView_MouseUp(object sender, MouseEventArgs e) {
       if(e.Button == MouseButtons.Right) {

trunk/sources/HeuristicLab.Functions/HeuristicLab.Functions.csproj

@@ -78 +78 @@
     <Compile Include="LessThan.cs" />
     <Compile Include="Not.cs" />
+    <Compile Include="SymbolicExpressionExporter.cs" />
     <Compile Include="Signum.cs" />
     <Compile Include="Logarithm.cs" />