add a test to SplineRouter

Signed-off-by: Lev Nachmanson <[email protected]>

Author: levnach

GraphLayout/MSAGL/Routing/Spline/ConeSpanner/LineSweeper.cs

@@ -280,9 +280,9 @@ internal static PolylinePoint InsertPointIntoPolylineAfter(Polyline borderPolyli
         }
 
         void ProcessEvent(SweepEvent p) {
-//            if(debug && (p.Site-new Point(-313.122 ,-170.6)).Length<1)
-//               Show( EllipseOnVert(p));
             var vertexEvent = p as VertexEvent;
+           
+
             if (vertexEvent != null)
                 ProcessVertexEvent(vertexEvent);
             else {
@@ -439,12 +439,7 @@ void CloseConesCoveredBySegment(Point leftPoint, Point rightPoint, RbTree<ConeSi
         }
 
         void ProcessVertexEvent(VertexEvent vertexEvent) {
-//            if (count == 872 && (vertexEvent.Site - new Point(-130.7368, -305.908)).Length < 1)
-//                Show(EllipseOnVert(vertexEvent));
-
             Z = GetZ(vertexEvent);
-            //PrintOutLeftSegTree();
-            //PrintOutRightSegTree();
             GoOverConesSeeingVertexEvent(vertexEvent);
             AddConeAndEnqueueEvents(vertexEvent);
         }
@@ -1058,11 +1053,10 @@ void GoOverConesSeeingVertexEvent(SweepEvent vertexEvent) {
 
             if (rbNode == null) {//it is an emergency measure and should not happen                
                 rbNode = GetRbNodeEmergency(rbNode, leftConeSide);
+                if (rbNode == null)
+                    return; // the cone is not there! and it is a bug
             }
 
-            if (rbNode == null)
-                return; // the cone is not there! and it is a bug
-
             rbNode = leftConeSides.Next(rbNode);
             while (rbNode != null && !VertexIsToTheLeftOfSegment(vertexEvent, rbNode.Item)) {
                 visibleCones.Add(rbNode.Item.Cone);

GraphLayout/MSAGL/Routing/SplineRouter.cs

@@ -935,18 +935,18 @@ void FillVisibilityGraphUnderShape(Shape shape) {
 
 #if TEST_MSAGL
     [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-    static internal void ShowVisGraph(VisibilityGraph tmpVisGraph, IEnumerable<Polyline> obstacles, IEnumerable<ICurve> greenCurves, IEnumerable<ICurve> redCurves) {
-      var l = new List<DebugCurve>(tmpVisGraph.Edges.Select(e => new DebugCurve(100, 1,
-          e.IsPassable != null && e.IsPassable() ? "green" : "black"
-          , new LineSegment(e.SourcePoint, e.TargetPoint))));
-      if (obstacles != null)
-        l.AddRange(obstacles.Select(p => new DebugCurve(100, 1, "brown", p)));
-      if (greenCurves != null)
-        l.AddRange(greenCurves.Select(p => new DebugCurve(100, 10, "navy", p)));
-      if (redCurves != null)
-        l.AddRange(redCurves.Select(p => new DebugCurve(100, 10, "red", p)));
-      LayoutAlgorithmSettings.ShowDebugCurvesEnumeration(l);
-    }
+        static internal void ShowVisGraph(VisibilityGraph tmpVisGraph, IEnumerable<Polyline> obstacles, IEnumerable<ICurve> greenCurves = null, IEnumerable<ICurve> redCurves = null) {
+          var l = new List<DebugCurve>(tmpVisGraph.Edges.Select(e => new DebugCurve(100, 1,
+              e.IsPassable != null && e.IsPassable() ? "green" : "black"
+              , new LineSegment(e.SourcePoint, e.TargetPoint))));
+          if (obstacles != null)
+            l.AddRange(obstacles.Select(p => new DebugCurve(100, 1, "brown", p)));
+          if (greenCurves != null)
+            l.AddRange(greenCurves.Select(p => new DebugCurve(100, 10, "navy", p)));
+          if (redCurves != null)
+            l.AddRange(redCurves.Select(p => new DebugCurve(100, 10, "red", p)));
+          LayoutAlgorithmSettings.ShowDebugCurvesEnumeration(l);
+        }
 #endif
     void TryToCreateNewEdgeAndSetIsPassable(VisibilityEdge edge, Shape looseShape) {
       var e = visGraph.FindEdge(edge.SourcePoint, edge.TargetPoint);

GraphLayout/Test/MSAGLTests/SplineRouterTests.cs

@@ -203,6 +203,90 @@ static Node SetNode(
             return geomNode;
         }
 
+        [TestMethod]
+        public void OneEdgeWithObstacle() {
+            GraphViewerGdi.DisplayGeometryGraph.SetShowFunctions();
+            var g = new GeometryGraph();
+            var a = new Node {
+                BoundaryCurve = CurveFactory.CreateRectangleWithRoundedCorners(
+              20,
+              20,
+              3,
+              3,
+              new Point(0, 0))
+            };
+            g.Nodes.Add(a);
+            var b = new Node {
+                BoundaryCurve = CurveFactory.CreateRectangleWithRoundedCorners(
+              20,
+              20,
+              3,
+              3,
+              new Point(0, 200))
+            };
+            g.Nodes.Add(b);
+            var c = new Node {
+                BoundaryCurve = CurveFactory.CreateRectangleWithRoundedCorners(
+              20,
+              20,
+              3,
+              3,
+              new Point(0, 300))
+            };
+            g.Nodes.Add(c);
+            var e = new Edge(a, c);
+            g.Edges.Add(e);
+            var sr = new SplineRouter(g, 2, 4, Math.PI / 6);
+            sr.Run();
+         //   GraphViewerGdi.DisplayGeometryGraph.ShowGraph(g);
+        }
+        [TestMethod]
+        public void OneEdgeWithTwoObstacles() {
+            GraphViewerGdi.DisplayGeometryGraph.SetShowFunctions();
+            var g = new GeometryGraph();
+            var a = new Node {
+                BoundaryCurve = CurveFactory.CreateRectangleWithRoundedCorners(
+              20,
+              20,
+              3,
+              3,
+              new Point(0, 0))
+            };
+            g.Nodes.Add(a);
+            var b = new Node {
+                BoundaryCurve = CurveFactory.CreateRectangleWithRoundedCorners(
+              40,
+              20,
+              3,
+              3,
+              new Point(-10, 200))
+            };
+            g.Nodes.Add(b);
+            var c = new Node {
+                BoundaryCurve = CurveFactory.CreateRectangleWithRoundedCorners(
+              60,
+              20,
+              3,
+              3,
+              new Point(35, 170))
+            };
+            g.Nodes.Add(c);
+            var d = new Node {
+                BoundaryCurve = CurveFactory.CreateRectangleWithRoundedCorners(
+              20,
+              20,
+              3,
+              3,
+              new Point(0, 270))
+            };
+            g.Nodes.Add(d);
+            var e = new Edge(a, d);
+            g.Edges.Add(e);
+            var sr = new SplineRouter(g, 2, 4, Math.PI / 6);
+            sr.Run();
+            GraphViewerGdi.DisplayGeometryGraph.ShowGraph(g);
+        }
+
         [TestMethod]
         public void SelfEdge() {
             var g = new GeometryGraph();