Changeset 11916

Timestamp:

02/05/15 17:04:30 (9 years ago)

Author:

bburlacu

Message:

#2215: Merged unit tests into the trunk.

Location:

trunk/sources/HeuristicLab.Tests

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicExpressionTreeBottomUpSimilarityCalculatorTest.cs (copied) (copied from branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Tests/SymbolicExpressionTreeBottomUpSimilarityCalculatorTest.cs) (4 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicExpressionTreeMaxCommonSubtreeSimilarityCalculatorTest.cs (copied) (copied from branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Tests/SymbolicExpressionTreeMaxCommonSubtreeSimilarityCalculatorTest.cs) (1 diff)
• HeuristicLab.Tests.csproj (modified) (1 diff)

trunk/sources/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicExpressionTreeBottomUpSimilarityCalculatorTest.cs

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Drawing;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
-using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views;
 using HeuristicLab.Random;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -29 +22 @@
     [TestCategory("Problems.DataAnalysis.Symbolic")]
     [TestProperty("Time", "short")]
-    public void TestBottomUpMatching() {
+    public void BottomUpTreeSimilarityCalculatorTestMapping() {
       TestMatchedNodes("(+ 1 2)", "(+ 2 1)", 5);
       TestMatchedNodes("(- 2 1)", "(- 1 2)", 2);
@@ -72 +65 @@
     [TestCategory("Problems.DataAnalysis.Symbolic")]
     [TestProperty("Time", "long")]
-    public void TestBottomUpSimilarityCalculatorPerformance() {
+    public void BottomUpTreeSimilarityCalculatorTestPerformance() {
       var grammar = new TypeCoherentExpressionGrammar();
       grammar.ConfigureAsDefaultRegressionGrammar();
@@ -93 +86 @@
       Console.WriteLine(N * (N + 1) / (2 * sw.ElapsedMilliseconds / 1000.0) + " similarity calculations per second.");
     }
-
-    private static string FormatMapping(ISymbolicExpressionTree t1, ISymbolicExpressionTree t2, Dictionary<ISymbolicExpressionTreeNode, ISymbolicExpressionTreeNode> map) {
-      var symbolNameMap = new Dictionary<string, string>
-    {
-      {"ProgramRootSymbol", "Prog"},
-      {"StartSymbol","RPB"},
-      {"Multiplication", "$\\times$"},
-      {"Division", "$\\div$"},
-      {"Addition", "$+$"},
-      {"Subtraction", "$-$"},
-      {"Exponential", "$\\exp$"},
-      {"Logarithm", "$\\log$"}
-    };
-
-      var sb = new StringBuilder();
-      var nodeIds = new Dictionary<ISymbolicExpressionTreeNode, string>();
-      int offset = 0;
-      var layoutEngine = new ReingoldTilfordLayoutEngine<ISymbolicExpressionTreeNode>(x => x.Subtrees);
-      var nodeCoordinates = layoutEngine.CalculateLayout(t1.Root).ToDictionary(n => n.Content, n => new PointF(n.X, n.Y));
-
-      double ws = 0.5;
-      double hs = 0.5;
-
-      var nl = Environment.NewLine;
-      sb.Append("\\documentclass[class=minimal,border=0pt]{standalone}" + nl +
-                 "\\usepackage{tikz}" + nl +
-                 "\\begin{document}" + nl +
-                 "\\begin{tikzpicture}" + nl +
-                 "\\def\\ws{1}" + nl +
-                 "\\def\\hs{0.7}" + nl +
-                 "\\def\\offs{" + offset + "}" + nl);
-
-      foreach (var node in t1.IterateNodesBreadth()) {
-        var id = Guid.NewGuid().ToString();
-        nodeIds[node] = id;
-        var coord = nodeCoordinates[node];
-        var nodeName = symbolNameMap.ContainsKey(node.Symbol.Name) ? symbolNameMap[node.Symbol.Name] : node.ToString();
-        sb.AppendLine(string.Format(CultureInfo.InvariantCulture, "\\node ({0}) at (\\ws*{1} + \\offs,\\hs*{2}) {{{3}}};", nodeIds[node], ws * coord.X, -hs * coord.Y, EscapeLatexString(nodeName)));
-      }
-
-      foreach (ISymbolicExpressionTreeNode t in t1.IterateNodesBreadth()) {
-        var n = t;
-        foreach (var s in t.Subtrees) {
-          sb.AppendLine(string.Format(CultureInfo.InvariantCulture, "\\draw ({0}) -- ({1});", nodeIds[n], nodeIds[s]));
-        }
-      }
-
-      nodeCoordinates = layoutEngine.CalculateLayout(t2.Root).ToDictionary(n => n.Content, n => new PointF(n.X, n.Y));
-
-      offset = 20;
-      sb.Append("\\def\\offs{" + offset + "}" + nl);
-      foreach (var node in t2.IterateNodesBreadth()) {
-        var id = Guid.NewGuid().ToString();
-        nodeIds[node] = id;
-        var coord = nodeCoordinates[node];
-        var nodeName = symbolNameMap.ContainsKey(node.Symbol.Name) ? symbolNameMap[node.Symbol.Name] : node.ToString();
-        sb.AppendLine(string.Format(CultureInfo.InvariantCulture, "\\node ({0}) at (\\ws*{1} + \\offs,\\hs*{2}) {{{3}}};", nodeIds[node], ws * coord.X, -hs * coord.Y, EscapeLatexString(nodeName)));
-      }
-
-      foreach (ISymbolicExpressionTreeNode t in t2.IterateNodesBreadth()) {
-        var n = t;
-        foreach (var s in t.Subtrees) {
-          sb.AppendLine(string.Format(CultureInfo.InvariantCulture, "\\draw ({0}) -- ({1});", nodeIds[n], nodeIds[s]));
-        }
-      }
-
-      foreach (var p in map) {
-        var id1 = nodeIds[p.Key];
-        var id2 = nodeIds[p.Value];
-
-        sb.Append(string.Format(CultureInfo.InvariantCulture, "\\path[draw,->,color=gray] ({0}) edge[bend left,dashed] ({1});" + Environment.NewLine, id1, id2));
-      }
-      sb.Append("\\end{tikzpicture}" + nl +
-                "\\end{document}" + nl);
-      return sb.ToString();
-    }
-
-    private static string EscapeLatexString(string s) {
-      return s.Replace("\\", "\\\\").Replace("{", "\\{").Replace("}", "\\}").Replace("_", "\\_");
-    }
   }
 }

trunk/sources/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicExpressionTreeMaxCommonSubtreeSimilarityCalculatorTest.cs

@@ -48 +48 @@
     [TestCategory("Problems.DataAnalysis.Symbolic")]
     [TestProperty("Time", "long")]
-    public void TestMaxCommonSubtreeSimilarityCalculatorPerformance() {
+    public void MaxCommonSubtreeSimilarityCalculatorTestPerformance() {
       var grammar = new TypeCoherentExpressionGrammar();
       grammar.ConfigureAsDefaultRegressionGrammar();

trunk/sources/HeuristicLab.Tests/HeuristicLab.Tests.csproj

@@ -492 +492 @@
     <Compile Include="HeuristicLab.Problems.DataAnalysis-3.4\OnlineCalculatorPerformanceTest.cs" />
     <Compile Include="HeuristicLab.Problems.DataAnalysis-3.4\StatisticCalculatorsTest.cs" />
+    <Compile Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4\SymbolicExpressionTreeBottomUpSimilarityCalculatorTest.cs" />
+    <Compile Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4\SymbolicExpressionTreeMaxCommonSubtreeSimilarityCalculatorTest.cs" />
     <Compile Include="HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis-3.4\SymbolicDataAnalysisExpressionTreeInterpreterTest.cs" />
     <Compile Include="HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis-3.4\Util.cs" />