Changeset 6878 for branches/GeneralizedQAP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Formatters/SymbolicDataAnalysisExpressionLatexFormatter.cs

Timestamp:

10/05/11 21:55:55 (13 years ago)

Author:

abeham

Message:

#1614

• updated branch from trunk

Location:

branches/GeneralizedQAP

Files:

• . (modified) (2 props)
• HeuristicLab.Problems.DataAnalysis.Symbolic (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4 (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Formatters/SymbolicDataAnalysisExpressionLatexFormatter.cs (modified) (5 diffs)

branches/GeneralizedQAP

@@ +1 @@
+*.docstates
+*.psess
 *.resharper
 *.suo
+*.vsp
 Google.ProtocolBuffers-0.9.1.dll
+HeuristicLab 3.3.5.1.ReSharper.user
+HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
 HeuristicLab.resharper.user
@@ -8 +13 @@
 _ReSharper.HeuristicLab
 _ReSharper.HeuristicLab 3.3
+_ReSharper.HeuristicLab.ExtLibs
+bin
 protoc.exe
-HeuristicLab 3.3.5.1.ReSharper.user
-*.psess
-*.vsp
-*.docstates
+HeuristicLab.ExtLibs.6.0.ReSharper.user

@@ +1 @@
+*.docstates
+*.psess
 *.resharper
 *.suo
+*.vsp
 Google.ProtocolBuffers-0.9.1.dll
+HeuristicLab 3.3.5.1.ReSharper.user
+HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
 HeuristicLab.resharper.user
@@ -8 +13 @@
 _ReSharper.HeuristicLab
 _ReSharper.HeuristicLab 3.3
+_ReSharper.HeuristicLab.ExtLibs
+bin
 protoc.exe
-HeuristicLab 3.3.5.1.ReSharper.user
-*.psess
-*.vsp
-*.docstates
+HeuristicLab.ExtLibs.6.0.ReSharper.user

branches/GeneralizedQAP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4

@@ -4 +4 @@
 obj
 *.vs10x
+Plugin.cs

@@ -4 +4 @@
 obj
 *.vs10x
+Plugin.cs

branches/GeneralizedQAP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Formatters/SymbolicDataAnalysisExpressionLatexFormatter.cs

@@ -73 +73 @@
       FormatBegin(node, strBuilder);
 
-      if (node.SubtreesCount > 0) {
+      if (node.SubtreeCount > 0) {
         strBuilder.Append(FormatRecursively(node.GetSubtree(0)));
       }
@@ -91 +91 @@
         strBuilder.Append(@" \left( ");
       } else if (node.Symbol is Subtraction) {
-        if (node.SubtreesCount == 1) {
+        if (node.SubtreeCount == 1) {
           strBuilder.Append(@"- \left(");
         } else {
@@ -98 +98 @@
       } else if (node.Symbol is Multiplication) {
       } else if (node.Symbol is Division) {
-        if (node.SubtreesCount == 1) {
+        if (node.SubtreeCount == 1) {
           strBuilder.Append(@" \cfrac{1}{");
         } else {
@@ -105 +105 @@
       } else if (node.Symbol is Average) {
         // skip output of (1/1) if only one subtree
-        if (node.SubtreesCount > 1) {
-          strBuilder.Append(@" \cfrac{1}{" + node.SubtreesCount + @"}");
+        if (node.SubtreeCount > 1) {
+          strBuilder.Append(@" \cfrac{1}{" + node.SubtreeCount + @"}");
         }
         strBuilder.Append(@" \left(");
@@ -246 +246 @@
       } else if (node.Symbol is Division) {
         strBuilder.Append("} ");
-        if (node.SubtreesCount > 1)
+        if (node.SubtreeCount > 1)
           strBuilder.Append("{1} ");
-        for (int i = 1; i < node.SubtreesCount; i++) {
+        for (int i = 1; i < node.SubtreeCount; i++) {
           strBuilder.Append(" } ");
         }

@@ +1 @@
+*.docstates
+*.psess
 *.resharper
 *.suo
+*.vsp
 Google.ProtocolBuffers-0.9.1.dll
+HeuristicLab 3.3.5.1.ReSharper.user
+HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
 HeuristicLab.resharper.user
@@ -8 +13 @@
 _ReSharper.HeuristicLab
 _ReSharper.HeuristicLab 3.3
+_ReSharper.HeuristicLab.ExtLibs
+bin
 protoc.exe
-HeuristicLab 3.3.5.1.ReSharper.user
-*.psess
-*.vsp
-*.docstates
+HeuristicLab.ExtLibs.6.0.ReSharper.user

@@ -4 +4 @@
 obj
 *.vs10x
+Plugin.cs