Changeset 2262 for branches/CEDMA-Exporter-715/tools/CedmaExporter/SymbolicExpressionExporter.cs

Timestamp:

08/08/09 11:07:24 (15 years ago)

Author:

gkronber

Message:

Fixed bug in s-exp export format of terminal nodes. #715

File:

• branches/CEDMA-Exporter-715/tools/CedmaExporter/SymbolicExpressionExporter.cs (modified) (2 diffs)

branches/CEDMA-Exporter-715/tools/CedmaExporter/SymbolicExpressionExporter.cs

@@ -71 +71 @@
         BuildExportString(subTree);
       }
-      if(tree.SubTrees.Count > 0) builder.Append(")");
+      builder.Append(")");
       currentIndent = currentIndent.Remove(0, 2);
     }
@@ -181 +181 @@
 
     public static string ExportToScheme(this Variable variable, IFunctionTree tree, Dataset ds) {
-      return "(variable " + tree.GetLocalVariable(Variable.WEIGHT).Value + " " +
-        ds.GetVariableName(int.Parse(tree.GetLocalVariable(Variable.INDEX).Value.ToString())) + " " + tree.GetLocalVariable(Variable.OFFSET).Value + ")";
+      return "variable " + tree.GetLocalVariable(Variable.WEIGHT).Value + " " +
+        ds.GetVariableName(int.Parse(tree.GetLocalVariable(Variable.INDEX).Value.ToString())) + " " + tree.GetLocalVariable(Variable.OFFSET).Value;
     }
     public static string ExportToScheme(this Differential differential, IFunctionTree tree, Dataset ds) {
-      return "(differential " + tree.GetLocalVariable(Differential.WEIGHT).Value + " " +
-        ds.GetVariableName(int.Parse(tree.GetLocalVariable(Differential.INDEX).Value.ToString())) + " " + tree.GetLocalVariable(Differential.OFFSET).Value + ")";
+      return "differential " + tree.GetLocalVariable(Differential.WEIGHT).Value + " " +
+        ds.GetVariableName(int.Parse(tree.GetLocalVariable(Differential.INDEX).Value.ToString())) + " " + tree.GetLocalVariable(Differential.OFFSET).Value;
     }