Changeset 7383 for branches/HiveHiveEngine/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers

Timestamp:

01/20/12 13:52:51 (13 years ago)

Author:

ascheibe

Message:

#1745 merged trunk changes into branch

Location:

branches/HiveHiveEngine

Files:

• . (modified) (2 props)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisAlleleFrequencyAnalyzer.cs (modified) (1 diff)

branches/HiveHiveEngine

@@ -3 +3 @@
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user
@@ -18 +20 @@
 bin
 protoc.exe
-*.user

@@ -3 +3 @@
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user
@@ -18 +20 @@
 bin
 protoc.exe
-*.user

branches/HiveHiveEngine/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisAlleleFrequencyAnalyzer.cs

@@ -84 +84 @@
       if (d == 0) return "";
       StringBuilder builder = new StringBuilder();
-      builder.Append("(" + tree.ToString());
+      var varTreeNode = tree as VariableTreeNode;
+      var constTreeNode = tree as ConstantTreeNode;
+      if (varTreeNode != null) {
+        builder.Append("(var " + varTreeNode.VariableName);
+      } else if (constTreeNode != null) {
+        builder.Append("(const");
+      } else {
+        builder.Append("(" + tree.ToString());
+      }
       for (int i = 0; i < tree.SubtreeCount; i++) {
         builder.Append(" " + GetTextualRepresentationFromSubtreeOfDepth(tree.GetSubtree(i), d - 1));

@@ -3 +3 @@
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user
@@ -18 +20 @@
 bin
 protoc.exe
-*.user