finish mapping

Author: GiggleLiu

src/gadgets.jl

@@ -297,7 +297,7 @@ function mapped_graph(::WTurn)
     return locs, unitdisk_graph(locs, 1.5), [1, 3]
 end
 Base.size(::WTurn) = (4, 4)
-cross_location(::WTurn) = (3,2)
+cross_location(::WTurn) = (2,2)
 iscon(::WTurn) = false
 
 struct BranchFixB <: CrossPattern end
@@ -409,6 +409,12 @@ for T in [:RotatedGadget, :ReflectedGadget]
     end
     @eval mis_overhead(p::$T) = mis_overhead(p.gadget)
     @eval vertex_overhead(p::$T) = vertex_overhead(p.gadget)
+    @eval function mapped_entry_to_compact(r::$T)
+        return mapped_entry_to_compact(r.gadget)
+    end
+    @eval function source_entry_to_configs(r::$T)
+        return source_entry_to_configs(r.gadget)
+    end
 end
 
 function _apply_transform(r::RotatedGadget, locs, center)

src/mapping.jl

@@ -25,7 +25,7 @@ struct UGrid
 end
 
 export coordinates
-Base.:(==)(ug::UGrid, ug2::UGrid) = ug.n == ug2.n && ug.content == ug2.content
+Base.:(==)(ug::UGrid, ug2::UGrid) = ug.lines == ug2.lines && ug.content == ug2.content
 padding(ug::UGrid) = ug.padding
 coordinates(ug::UGrid) = [ci.I for ci in findall(!iszero, ug.content)]
 
@@ -137,7 +137,7 @@ function unapply_gadgets!(ug::UGrid, tape, configurations)
         unapply_gadget!(pattern, ug.content, i, j)
     end
     cfgs = map(configurations) do c
-        map_config_copyback!(ug.n, c, ug.padding)
+        map_config_copyback!(ug, c)
     end
     return ug, cfgs
 end
@@ -178,6 +178,33 @@ function map_config_back!(p::Pattern, i, j, configuration)
     return configuration
 end
 
+function map_config_copyback!(ug::UGrid, c::AbstractMatrix)
+    res = zeros(Int, length(ug.lines))
+    for line in ug.lines
+        locs = copyline_locations(line; padding=ug.padding)
+        count = 0
+        for (iloc, loc) in enumerate(locs)
+            gi, ci = ug.content[loc...], c[loc...]
+            if gi == 2
+                if ci == 2
+                    count += 1
+                elseif ci == 0
+                    count += 0
+                else    # ci = 1
+                    if c[locs[iloc-1]...] == 0 && c[locs[iloc+1]...] == 0
+                        count += 1
+                    end
+                end
+            elseif abs(gi) == 1
+                count += ci
+            else
+                error("check your grid at location ($(locs...))!")
+            end
+        end
+        res[line.vertex] = count - (length(locs) ÷ 2)
+    end
+    return res
+end
 function map_config_copyback!(n::Int, c::AbstractMatrix, padding::Int)
     store = copy(c)
     s = 4
@@ -352,3 +379,11 @@ function embed_graph2(g::SimpleGraph)
     return ug
 end
 
+export mis_overhead_copylines
+function mis_overhead_copylines(ug::UGrid)
+    sum(ug.lines) do line
+        locs = copyline_locations(line; padding=ug.padding)
+        @assert length(locs) % 2 == 1
+        length(locs) ÷ 2
+    end
+end

test/mapping.jl

@@ -3,13 +3,23 @@ using Graphs, GraphTensorNetworks
 
 @testset "crossing connect count" begin
     g = smallgraph(:bull)
-    ug = embed_graph(g)
-    for (s, c) in zip([Cross{false}(), Cross{true}(), TShape{true}(), TShape{false}(),
-            Turn()], [2,4,1,3,4])
+    ug = embed_graph2(g)
+    for (s, c) in zip([
+                    Cross{false}(), Cross{true}(), TShape{false}(), TShape{true}(),
+                    Turn(), WTurn(), Branch(), BranchFix(), TCon(), TrivialTurn(),
+                    RotatedGadget(TCon(), 1), ReflectedGadget(Cross{true}(), "y"),
+                    ReflectedGadget(TrivialTurn(), "y"), BranchFixB(),
+                    ReflectedGadget(RotatedGadget(TCon(), 1), "y"),],
+                    [1,0,0,0,
+                    1,1,0,1,1,1,
+                    0, 0,
+                    2, 0,
+                    1,
+                    ])
         @show s
         @test sum(match.(Ref(s), Ref(ug.content), (0:size(ug.content, 1))', 0:size(ug.content,2))) == c
     end
-    mug, tape = apply_gadgets!(copy(ug))
+    mug, tape = apply_crossing_gadgets!(copy(ug))
     for s in [Cross{false}(), Cross{true}(), TShape{true}(), TShape{false}(),
             Turn()]
         @test sum(match.(Ref(s), Ref(mug.content), (0:size(mug.content, 1))', 0:size(mug.content,2))) == 0
@@ -20,11 +30,12 @@ using Graphs, GraphTensorNetworks
 end
 
 @testset "map configurations back" begin
-    for g in [smallgraph(:petersen), smallgraph(:bull), smallgraph(:cubical), smallgraph(:house), smallgraph(:diamond)]
-        @show g
-        ug = embed_graph(g)
-        mis_overhead0 = 2 * nv(g) * (nv(g)-1) + nv(g)
-        ug2, tape = apply_gadgets!(copy(ug))
+    for graphname in [:petersen, :bull, :cubical, :house, :diamond]
+        @show graphname
+        g = smallgraph(graphname)
+        ug = embed_graph2(g)
+        mis_overhead0 = mis_overhead_copylines(ug)
+        ug2, tape = apply_crossing_gadgets!(copy(ug))
         mis_overhead1 = sum(x->mis_overhead(x[1]), tape)
         missize_map = solve(Independence(SimpleGraph(ug2)), "size max"; optimizer=TreeSA(ntrials=1, niters=10), simplifier=MergeGreedy())[].n
         missize = solve(Independence(g), "size max")[].n

test/pathdecomposition/pathdecomposition.jl

@@ -1,5 +1,5 @@
 using Random, Test, UnitDiskMapping
-using UnitDiskMapping.PathDecomposition: branch_and_bound, vsep, Layout, addremove_format
+using UnitDiskMapping.PathDecomposition: branch_and_bound, vsep, Layout
 using Graphs
 
 @testset "B & B" begin
@@ -12,8 +12,8 @@ using Graphs
         L = branch_and_bound(gi)
         @test vsep(L) == 5
         @test vsep(Layout(gi, L.vertices)) == 5
-        arem = addremove_format(L, g)
-        @test sum(x->length(x[2]), arem) == nv(g)
+        arem = UnitDiskMapping.remove_order(g, vertices(L))
+        @test sum(length, arem) == nv(g)
     end
     g = smallgraph(:tutte)
     res = pathwidth(g, Branching())