Changeset 5019 for branches/DataAnalysis.Extensions/HeuristicLab.Problems.DataAnalysis/3.3

Timestamp:

12/04/10 09:51:59 (14 years ago)

Author:

gkronber

Message:

Adapted complex program code in MATLAB exporter and reformatted code to adhere to HL coding guidelines. #1314

File:

• branches/DataAnalysis.Extensions/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Formatters/SymbolicExpressionTreeMATLABFormatter.cs (modified) (5 diffs)

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

@@ -21 +21 @@
 
 using System.Text;
+using System.Linq;
 using HeuristicLab.Core;
 using HeuristicLab.Common;
@@ -38 +39 @@
     protected SymbolicExpressionTreeMATLABFormatter(SymbolicExpressionTreeMATLABFormatter original, Cloner cloner) : base(original, cloner) { }
     public SymbolicExpressionTreeMATLABFormatter()
-        : base() {
+      : base() {
       Name = "MATLAB String Formatter";
     }
@@ -53 +54 @@
 
       if (symbol is ProgramRootSymbol) {
-        IList<VariableTreeNode> variableTreeNodesList = getVariableTreeNodes(node);
-        string[] variableNames = new string[variableTreeNodesList.Count];
-        for (int i = 0; i < variableTreeNodesList.Count; i++)
-          variableNames[i] = variableTreeNodesList[i].VariableName;
-        Array.Sort(variableNames);
+        // all variable names, contains duplicates!
+        var variableNames = node.IterateNodesPostfix()
+          .OfType<VariableTreeNode>()
+          .Select(n => n.VariableName)
+          .OrderBy(x => x);
         foreach (string variableName in variableNames)
           stringBuilder.AppendLine(variableName + " = Data(:, ???);");
@@ -191 +192 @@
         stringBuilder.Append("*");
         stringBuilder.Append(variableTreeNode.VariableName + "(i)");
-      }
-
-      else {
+      } else {
         stringBuilder.Append("ERROR");
       }
@@ -202 +201 @@
     }
 
-    private static IList<VariableTreeNode> getVariableTreeNodes(SymbolicExpressionTreeNode root) {
-      IList<VariableTreeNode> variableTreeNodes = new List<VariableTreeNode>();
-      addVariableTreeNodes(variableTreeNodes, root);
-      return variableTreeNodes;
-    }
-    private static void addVariableTreeNodes(IList<VariableTreeNode> variableTreeNodes, SymbolicExpressionTreeNode node) {
-      VariableTreeNode variableTreeNode = node as VariableTreeNode;
-      if (variableTreeNode != null) variableTreeNodes.Add(variableTreeNode);
-      for (int i = 0; i < node.SubTrees.Count; i++)
-        addVariableTreeNodes(variableTreeNodes, node.SubTrees[i]);
-    }
-
     public override IDeepCloneable Clone(Cloner cloner) {
       return new SymbolicExpressionTreeMATLABFormatter(this, cloner);
     }
-
   }
-
 }