Cleanup and more tests

Author: gpeairs

docs/src/routes.md

@@ -102,7 +102,8 @@ end
 c = Cell("test")
 render!.(c, paths, GDSMeta())
 render!(c, channel_path, GDSMeta(2))
-save("straight_channel.svg", flatten(c); width=6inch, height=2inch)
+save("straight_channel.svg", flatten(c); width=6inch, height=2inch);
+nothing; # hide
 ```
 
 ```@raw html
@@ -139,7 +140,8 @@ end
 c = Cell("test")
 render!.(c, paths, GDSMeta())
 render!(c, channel_path, GDSMeta(2))
-save("bspline_channel.svg", flatten(c); width=6inch, height=4inch)
+save("bspline_channel.svg", flatten(c); width=6inch, height=4inch);
+nothing; # hide
 ```
 
 ```@raw html
@@ -174,7 +176,8 @@ end
 c = Cell("test")
 render!.(c, paths, GDSMeta())
 render!(c, channel_path, GDSMeta(2))
-save("compound_channel.svg", flatten(c); width=6inch, height=4inch)
+save("compound_channel.svg", flatten(c); width=6inch, height=4inch);
+nothing; # hide
 ```
 
 ```@raw html

src/paths/channels.jl

@@ -130,10 +130,10 @@ reverse(s::GeneralCPW, l) = GeneralCPW(t -> trace(s, l - t), t -> gap(s, l - t))
 # Keep the same tag so if a compound segment/style pair matched before they will still match
 reverse(s::CompoundSegment) = CompoundSegment(reverse(reverse.(s.segments)), s.tag)
 function reverse(s::CompoundStyle{T}, l) where {T}
-    lengths = reverse(diff(s.tgrid))
+    lengths = reverse(diff(s.grid))
     return CompoundStyle{T}(
         reverse(reverse.(s.styles, lengths)),
-        cumsum(reverse(lengths)),
+        [zero(T); cumsum(reverse(lengths))],
         s.tag
     )
 end

test/test_channels.jl

@@ -160,6 +160,8 @@ end
         rule = transition_rules[1]
         paths = test_single_channel_reversals(rule, channel_segments[1], channel_styles[1])
         @test isempty(Intersect.intersections(paths...))
+        c = Cell("test", nm)
+        render!(c, paths[1], GDSMeta()) # No error
     end
     rule = transition_rules[2] # BSpline rule for all-angle transitions
     for segtype in channel_segments[2:end]
@@ -169,6 +171,22 @@ end
             end
         end
     end
+    # Channel too short
+    pa = Path(0.0nm, 0.0nm)
+    straight!(pa, 100nm, Paths.Trace(0.1mm))
+    ch = RouteChannel(pa)
+    pa2 = Path(-0.1mm, 0mm)
+    rule = Paths.SingleChannelRouting(
+        ch,
+        Paths.BSplineRouting(auto_curvature=true, auto_speed=true),
+        50μm
+    )
+    Paths.set_track!(rule, pa2, 1)
+    route!(pa2, Point(0.1mm, 0.1mm), 0, rule, Paths.CPW(2nm, 2nm))
+    c = Cell("test", nm)
+    render!(c, pa2, GDSMeta()) # No error
+    @test length(pa2) == 1 # Channel segment turned into waypoint
+
     ## Schematic-level routing
     test_schematic_single_channel()
 end

test/test_render.jl

@@ -209,6 +209,9 @@ end
         pa = Path{Float64}()
         straight!(pa, 20.0, Paths.Trace(x -> 2.0 * x))
         render!(c, pa)
+        revsty = reverse(pa[1]).sty
+        @test Paths.width(revsty, 0) == Paths.trace(pa[1].sty, 20)
+        @test Paths.extent(revsty)(20) == 0.5 * Paths.width(pa[1].sty)(0)
     end
 
     @testset "Straight, SimpleCPW" begin
@@ -228,6 +231,9 @@ end
             p(20.082731241720513, 1.7128648145206729),
             p(0.5197792270443984, -2.4453690018345142)
         ]
+        revsty = reverse(pa[1]).sty
+        @test Paths.trace(revsty, 0) == Paths.trace(pa[1].sty, 20)
+        @test Paths.trace(revsty, 20) == Paths.trace(pa[1].sty, 0)
 
         c = Cell("main", pm2μm)
         pa = Path(μm2μm, α0=12°)
@@ -249,9 +255,14 @@ end
         ] * 10^6
     end
 
-    # @testset "Straight, GeneralCPW" begin
-    #
-    # end
+    @testset "Straight, GeneralCPW" begin
+        c = Cell{Float64}("main")
+        pa = Path(NoUnits, α0=12°)
+        straight!(pa, 20.0, Paths.CPW(x -> 2 * x, x -> 3 * x))
+        revsty = reverse(pa[1]).sty
+        @test Paths.trace(revsty, 0) == Paths.trace(pa[1].sty, 20)
+        @test Paths.trace(revsty, 20) == Paths.trace(pa[1].sty, 0)
+    end
 
     @testset "Turn, SimpleTrace" begin
         c = Cell{Float64}("main")
@@ -424,6 +435,9 @@ end
             p(50000.0nm, -4000.0nm),
             p(0.0nm, -5000.0nm)
         ]
+        revsty = reverse(pa[1]).sty
+        @test Paths.trace(revsty, 0.0μm) == Paths.trace(pa[1].sty, 50.0μm)
+        @test Paths.trace(revsty, 50.0μm) == Paths.trace(pa[1].sty, 0.0μm)
 
         @test_throws "length" split(Paths.TaperCPW(10.0μm, 6.0μm, 8.0μm, 2.0μm), 10μm)
 
@@ -447,6 +461,7 @@ end
         pa = Path(μm)
         turn!(pa, π / 2, 20μm, Paths.TaperTrace(10μm, 20μm))
         render!(c, pa, GDSMeta(0))
+        @test Paths.trace(pa[1].sty, 0μm) == 10μm
 
         @test (elements(c)[1]).p[1] ≈ p(0.0nm, -5000.0nm)
         @test (elements(c)[1]).p[end] ≈ p(0.0nm, 5000.0nm)
@@ -556,6 +571,9 @@ end
         straight!(pa, 20μm, Paths.Trace(15μm))
         straight!(pa, 20μm, Paths.Trace(20μm))
         simplify!(pa)
+        revsty = reverse(pa[1]).sty
+        @test Paths.trace(revsty, 55μm) == Paths.trace(pa[1].sty, 5μm)
+        @test Paths.trace(revsty, 5μm) == Paths.trace(pa[1].sty, 55μm)
 
         pa2 = split(pa[1], 20μm)
         @test length(pa2) == 2