clean up

Author: GiggleLiu

project/createmap.jl

@@ -57,5 +57,5 @@ function dump_mapping_to_julia(filename, patterns)
 end
 
 dump_mapping_to_julia(joinpath(@__DIR__, "..", "src", "extracting_results.jl"),
-    (Cross{false}(), Cross{true}(), TShape{true}(), TShape{false}(),
+    (Cross{false}(), Cross{true}(),
     Turn(), WTurn(), Branch(), BranchFix(), TrivialTurn(), TCon(), BranchFixB()))

project/vizgadget.jl

@@ -65,7 +65,7 @@ end
 
 function pattern2tikz(folder::String)
     for (p, sub) in ((Cross{true}(), "crosscon"), (Cross{false}(), "cross"),
-        (TShape{true}(), "tshapecon"), (TShape{false}(), "tshape"), (Turn(), "turn"))
+        (Turn(), "turn"))
         open(joinpath(folder, sub*"-udg.tex"), "w") do f
             write(f, viz_gadget(p))
         end

project/vizugrid.jl

@@ -2,7 +2,7 @@ using UnitDiskMapping
 
 function print_mapback(folder::String)
     for (p, sub) in ((Cross{true}(), "crosscon"), (Cross{false}(), "cross"),
-        (TShape{true}(), "tshapecon"), (TShape{false}(), "tshape"), (Turn(), "turn"))
+        (Turn(), "turn"))
         println()
         println(typeof(p))
         for (bc, bcs) in allbcs(p)

src/UnitDiskMapping.jl

@@ -4,9 +4,9 @@ module UnitDiskMapping
 
 using Graphs
 
-export UGrid, apply_crossing_gadgets!, apply_gadget!, embed_graph, unitdisk_graph
+export UGrid, apply_crossing_gadgets!, apply_gadget!, embed_graph
 export unapply_gadgets!, unmatch
-export Pattern, TShape, Corner, Turn, Cross, source_graph, mapped_graph, TruncatedTurn
+export Pattern, Corner, Turn, Cross, source_graph, mapped_graph, TruncatedTurn
 export mapped_entry_to_compact, source_entry_to_configs, map_config_back
 
 include("utils.jl")

src/extracting_results.jl

@@ -5,7 +5,7 @@ function mapped_entry_to_compact(::Cross{false})
 end
 
 function source_entry_to_configs(::Cross{false})
-    return Dict(Pair{Int64, Vector{BitVector}}[5 => [[1, 0, 1, 0, 0, 0, 1, 0, 1], [1, 0, 0, 1, 0, 0, 1, 0, 1]], 12 => [[0, 0, 1, 0, 1, 0, 1, 0, 1], [0, 1, 0, 0, 1, 0, 1, 0, 1]], 8 => [[0, 0, 1, 0, 1, 0, 1, 0, 0], [0, 1, 0, 0, 1, 0, 1, 0, 0], [0, 0, 1, 0, 1, 0, 0, 1, 0], [0, 1, 0, 0, 1, 0, 0, 1, 0]], 1 => [[1, 0, 1, 0, 0, 0, 1, 0, 0], [1, 0, 0, 1, 0, 0, 1, 0, 0], [1, 0, 1, 0, 0, 0, 0, 1, 0], [1, 0, 0, 1, 0, 0, 0, 1, 0]], 0 => [[0, 1, 0, 1, 0, 0, 1, 0, 0], [0, 1, 0, 1, 0, 0, 0, 1, 0]], 6 => [[0, 1, 0, 1, 0, 1, 0, 0, 1]], 11 => [[1, 0, 1, 0, 1, 1, 0, 1, 0]], 9 => [[1, 0, 1, 0, 1, 0, 1, 0, 0], [1, 0, 1, 0, 1, 0, 0, 1, 0]], 14 => [[0, 0, 1, 0, 1, 1, 0, 0, 1], [0, 1, 0, 0, 1, 1, 0, 0, 1]], 3 => [[1, 0, 1, 0, 0, 1, 0, 1, 0], [1, 0, 0, 1, 0, 1, 0, 1, 0]], 7 => [[1, 0, 1, 0, 0, 1, 0, 0, 1], [1, 0, 0, 1, 0, 1, 0, 0, 1]], 4 => [[0, 1, 0, 1, 0, 0, 1, 0, 1]], 13 => [[1, 0, 1, 0, 1, 0, 1, 0, 1]], 15 => [[1, 0, 1, 0, 1, 1, 0, 0, 1]], 2 => [[0, 1, 0, 1, 0, 1, 0, 1, 0]], 10 => [[0, 0, 1, 0, 1, 1, 0, 1, 0], [0, 1, 0, 0, 1, 1, 0, 1, 0]]])
+    return Dict(Pair{Int64, Vector{BitVector}}[5 => [[1, 0, 0, 1, 0, 0, 1, 0, 1], [1, 0, 1, 0, 0, 0, 1, 0, 1]], 12 => [[0, 1, 0, 0, 1, 0, 1, 0, 1], [0, 0, 1, 0, 1, 0, 1, 0, 1]], 8 => [[0, 1, 0, 0, 1, 0, 0, 1, 0], [0, 0, 1, 0, 1, 0, 0, 1, 0], [0, 1, 0, 0, 1, 0, 1, 0, 0], [0, 0, 1, 0, 1, 0, 1, 0, 0]], 1 => [[1, 0, 0, 1, 0, 0, 0, 1, 0], [1, 0, 1, 0, 0, 0, 0, 1, 0], [1, 0, 0, 1, 0, 0, 1, 0, 0], [1, 0, 1, 0, 0, 0, 1, 0, 0]], 0 => [[0, 1, 0, 1, 0, 0, 0, 1, 0], [0, 1, 0, 1, 0, 0, 1, 0, 0]], 6 => [[0, 1, 0, 1, 0, 1, 0, 0, 1]], 11 => [[1, 0, 1, 0, 1, 1, 0, 1, 0]], 9 => [[1, 0, 1, 0, 1, 0, 0, 1, 0], [1, 0, 1, 0, 1, 0, 1, 0, 0]], 14 => [[0, 1, 0, 0, 1, 1, 0, 0, 1], [0, 0, 1, 0, 1, 1, 0, 0, 1]], 3 => [[1, 0, 0, 1, 0, 1, 0, 1, 0], [1, 0, 1, 0, 0, 1, 0, 1, 0]], 7 => [[1, 0, 0, 1, 0, 1, 0, 0, 1], [1, 0, 1, 0, 0, 1, 0, 0, 1]], 4 => [[0, 1, 0, 1, 0, 0, 1, 0, 1]], 13 => [[1, 0, 1, 0, 1, 0, 1, 0, 1]], 15 => [[1, 0, 1, 0, 1, 1, 0, 0, 1]], 2 => [[0, 1, 0, 1, 0, 1, 0, 1, 0]], 10 => [[0, 1, 0, 0, 1, 1, 0, 1, 0], [0, 0, 1, 0, 1, 1, 0, 1, 0]]])
 end
 
 
@@ -18,24 +18,6 @@ function source_entry_to_configs(::Cross{true})
 end
 
 
-function mapped_entry_to_compact(::TShape{true})
-    return Dict([0 => 0, 4 => 4, 5 => 5, 6 => 2, 2 => 2, 7 => 7, 3 => 3, 1 => 1])
-end
-
-function source_entry_to_configs(::TShape{true})
-    return Dict(Pair{Int64, Vector{BitVector}}[0 => [[0, 0, 0, 1, 0], [0, 0, 1, 0, 0]], 4 => [[0, 0, 1, 0, 1]], 5 => [], 6 => [[0, 1, 0, 0, 1]], 2 => [[0, 1, 0, 1, 0]], 7 => [], 3 => [[1, 1, 0, 1, 0]], 1 => [[1, 0, 0, 1, 0], [1, 0, 1, 0, 0]]])
-end
-
-
-function mapped_entry_to_compact(::TShape{false})
-    return Dict([0 => 0, 4 => 0, 5 => 1, 6 => 6, 2 => 0, 7 => 7, 3 => 1, 1 => 1])
-end
-
-function source_entry_to_configs(::TShape{false})
-    return Dict(Pair{Int64, Vector{BitVector}}[0 => [[0, 0, 1, 0, 1, 0]], 4 => [[0, 0, 0, 1, 0, 1], [0, 0, 1, 0, 0, 1]], 5 => [[1, 0, 0, 1, 0, 1], [1, 0, 1, 0, 0, 1]], 6 => [[0, 1, 0, 1, 0, 1]], 2 => [[0, 1, 0, 1, 0, 0], [0, 1, 0, 0, 1, 0]], 7 => [[1, 1, 0, 1, 0, 1]], 3 => [[1, 1, 0, 1, 0, 0], [1, 1, 0, 0, 1, 0]], 1 => [[1, 0, 1, 0, 1, 0]]])
-end
-
-
 function mapped_entry_to_compact(::Turn)
     return Dict([0 => 0, 2 => 0, 3 => 3, 1 => 0])
 end
@@ -68,7 +50,7 @@ function mapped_entry_to_compact(::BranchFix)
 end
 
 function source_entry_to_configs(::BranchFix)
-    return Dict(Pair{Int64, Vector{BitVector}}[0 => [[0, 1, 0, 1, 0, 0], [0, 1, 0, 0, 1, 0], [0, 0, 1, 0, 1, 0]], 2 => [[0, 1, 0, 1, 0, 1]], 3 => [[1, 0, 0, 1, 0, 1], [1, 0, 1, 0, 0, 1]], 1 => [[1, 0, 1, 0, 1, 0]]])
+    return Dict(Pair{Int64, Vector{BitVector}}[0 => [[0, 0, 1, 0, 1, 0], [0, 1, 0, 0, 1, 0], [0, 1, 0, 1, 0, 0]], 2 => [[0, 1, 0, 1, 0, 1]], 3 => [[1, 0, 1, 0, 0, 1], [1, 0, 0, 1, 0, 1]], 1 => [[1, 0, 1, 0, 1, 0]]])
 end
 
 

src/gadgets.jl

@@ -161,52 +161,6 @@ end
 Base.size(::Cross{false}) = (4, 5)
 cross_location(::Cross{false}) = (2,3)
 
-struct TShape{CON} <: CrossPattern end
-iscon(::TShape{CON}) where {CON} = CON
-# ⋅ ● ⋅ ⋅ 
-# ⋅ ● ⋅ ⋅ 
-# ● ● ⋅ ⋅ 
-# ⋅ ● ⋅ ⋅ 
-# ⋅ ● ⋅ ⋅
-function source_graph(::TShape{false})
-    locs = [(3, 1), (1,2), (2,2), (3,2), (4,2), (5,2)]
-    g = simplegraph([(2,3), (3,4), (4,5), (5,6)])
-    return locs, g, [1,2,6]
-end
-
-# ⋅ ● ⋅ ⋅ 
-# ⋅ ⋅ ● ⋅ 
-# ● ⋅ ● ⋅ 
-# ⋅ ⋅ ● ⋅ 
-# ⋅ ● ⋅ ⋅
-function mapped_graph(::TShape{false})
-    locs = [(3, 1), (1,2), (2,3), (3,3), (4,3), (5,2)]
-    locs, unitdisk_graph(locs, 1.5), [1, 2, 6]
-end
-Base.size(::TShape{false}) = (5, 4)
-cross_location(::TShape{false}) = (3,2)
-
-#   ●
-#   ●
-# ◆ ● 
-#   ◆
-function source_graph(::TShape{true})
-    locs = [(3, 1), (1,2), (2,2), (3,2), (4,2)]
-    g = simplegraph([(1,5), (2,3), (3,4), (4,5)])
-    return locs, g, [1,2,5]
-end
-#   ●
-#     ●
-# ●   ● 
-#   ●
-function mapped_graph(::TShape{true})
-    locs = [(3, 1), (1,2), (2,3), (3,3), (4,2)]
-    locs, unitdisk_graph(locs, 1.5), [1, 2, 5]
-end
-connect_locations(::TShape{true}) = [(3, 1), (4,2)]
-Base.size(::TShape{true}) = (4, 4)
-cross_location(::TShape{true}) = (3,2)
-
 struct Turn <: CrossPattern end
 iscon(::Turn) = false
 # ⋅ ● ⋅ ⋅ 
@@ -450,7 +404,7 @@ end
 for T in [:Cross, :Turn, :WTurn, :Branch, :BranchFix, :BranchFixB]
     @eval mis_overhead(p::$T) = -1
 end
-for T in [:TrivialTurn, :TShape, :TCon]
+for T in [:TrivialTurn, :TCon]
     @eval mis_overhead(p::$T) = 0
 end
 

src/mapping.jl

@@ -29,29 +29,6 @@ Base.:(==)(ug::UGrid, ug2::UGrid) = ug.lines == ug2.lines && ug.content == ug2.c
 padding(ug::UGrid) = ug.padding
 coordinates(ug::UGrid) = [ci.I for ci in findall(!iszero, ug.content)]
 
-function plain_ugrid(n::Int; padding=2)
-    @assert padding >= 2
-    s = 4
-    N = (n-1)*s+1+2*padding
-    u = zeros(Int, N, N)
-    for j=n-1:-1:0
-        for i=0:n-1
-            # two extra rows
-            if 1<=i<=2
-                u[i+1, s*j+1+padding] += 1
-            end
-            # others
-            if i<=j
-                u[max(2+padding, s*i-s+4+padding):2:s*i+2+padding, s*j+1+padding] .+= 1
-                i!=0 && (u[s*i-s+3+padding:2:s*i+padding+1, s*j+1+padding] .+= 1)
-            else
-                u[s*j+3+padding, max(1+padding, s*i-s+1+padding):s*i+padding] .+= 1
-            end
-        end
-    end
-    return UGrid(collect(1:n), padding, u)
-end
-
 function Graphs.SimpleGraph(ug::UGrid)
     if any(x->abs(x)>1, ug.content)
         error("This mapping is not done yet!")
@@ -72,16 +49,6 @@ function print_ugrid(io::IO, content::AbstractMatrix)
     end
 end
 Base.copy(ug::UGrid) = UGrid(ug.lines, ug.padding, copy(ug.content))
-function crossat(ug::UGrid, i, j)
-    s = 4
-    return (i-1)*s+3+ug.padding, (j-1)*s+1+ug.padding
-end
-function Graphs.add_edge!(ug::UGrid, i, j)
-    I, J = crossat(ug, i, j)
-    ug.content[I+1, J] *= -1
-    ug.content[I, J-1] *= -1
-    return ug
-end
 
 function showitem(io, x)
     if x == 1
@@ -103,7 +70,7 @@ end
 # 1. check if the resulting graph is a unit-disk
 # 2. other simplification rules
 function apply_crossing_gadgets!(ug::UGrid, ruleset=(
-                    Cross{false}(), Cross{true}(), TShape{false}(), TShape{true}(),
+                    Cross{false}(),
                     Turn(), WTurn(), Branch(), BranchFix(), TCon(), TrivialTurn(),
                     RotatedGadget(TCon(), 1), ReflectedGadget(Cross{true}(), "y"),
                     ReflectedGadget(TrivialTurn(), "y"), BranchFixB(),
@@ -115,7 +82,7 @@ function apply_crossing_gadgets!(ug::UGrid, ruleset=(
         for i=1:n
             matched = false
             for pattern in ruleset
-                x, y = crossat2(ug, i, j) .- cross_location(pattern) .+ (1,1)
+                x, y = crossat(ug, i, j) .- cross_location(pattern) .+ (1,1)
                 if match(pattern, ug.content, x, y)
                     apply_gadget!(pattern, ug.content, x, y)
                     push!(tape, (pattern, x, y))
@@ -142,17 +109,6 @@ function unapply_gadgets!(ug::UGrid, tape, configurations)
     return ug, cfgs
 end
 
-function unitdisk_graph(locs::AbstractVector, unit::Real)
-    n = length(locs)
-    g = SimpleGraph(n)
-    for i=1:n, j=i+1:n
-        if sum(abs2, locs[i] .- locs[j]) < unit ^ 2
-            add_edge!(g, i, j)
-        end
-    end
-    return g
-end
-
 # returns a vector of configurations
 function _map_config_back(s::Pattern, config)
     d1 = mapped_entry_to_compact(s)
@@ -205,66 +161,6 @@ function map_config_copyback!(ug::UGrid, c::AbstractMatrix)
     end
     return res
 end
-function map_config_copyback!(n::Int, c::AbstractMatrix, padding::Int)
-    store = copy(c)
-    s = 4
-    res = zeros(Int, n)
-    for j=1:n
-        for i=1:(n-1)*s + 3
-            J = (j-1)*s + 1 + padding
-            if i > (j-1)*s+4
-                J += i-(j-1)*s-4
-                I = (j-1)*s + 3 + padding
-                # bits belong to horizontal lines
-                if i%s != 0 || (safe_get(c, I, J-1) == 0 && safe_get(c, I, J+1) == 0)
-                    if store[I, J] != 0
-                        res[j] += 1
-                        store[I, J] -= 1
-                    end
-                end
-            else
-                I = i-1 + padding
-                # bits belong to vertical lines
-                if i%s != 0 || (safe_get(c, I-1, J) == 0 && safe_get(c, I+1, J) == 0)
-                    if store[I, J] != 0
-                        res[j] += 1
-                        store[I, J] -= 1
-                    end
-                end
-            end
-        end
-    end
-    return map(res) do x
-        if x == 2*(n-1)+1
-            false
-        elseif x == 2*(n-1) + 2
-            true
-        else
-            error("mapping back fail! got $x (overhead = $((n-1)*2))")
-        end
-    end
-end
-
-export is_independent_set
-function is_independent_set(g::SimpleGraph, config)
-    for e in edges(g)
-        if config[e.src] == config[e.dst] == 1
-            return false
-        end
-    end
-    return true
-end
-
-function embed_graph(g::SimpleGraph)
-    ug = plain_ugrid(nv(g))
-    for e in edges(g)
-        add_edge!(ug, e.src, e.dst)
-    end
-    return ug
-end
-
-
-##################### reordered mapping ###################
 
 function remove_order(g::AbstractGraph, vertex_order::AbstractVector{Int})
     addremove = [Int[] for _=1:nv(g)]
@@ -355,20 +251,31 @@ function ugrid(g::SimpleGraph, vertex_order::AbstractVector{Int}; padding=2, nro
     return UGrid(copylines, padding, u)
 end
 
-function crossat2(ug::UGrid, v, w)
+function crossat(ug::UGrid, v, w)
     i, j = findfirst(x->x.vertex==v, ug.lines), findfirst(x->x.vertex==w, ug.lines)
     i, j = minmax(i, j)
     hslot = ug.lines[i].hslot
     s = 4
     return (hslot-1)*s+2+ug.padding, (j-1)*s+1+ug.padding
 end
 
-export embed_graph2
-function embed_graph2(g::SimpleGraph; vertex_order_optimizer=Greedy())
-    L = pathwidth(g, vertex_order_optimizer)
+"""
+    embed_graph(g::SimpleGraph; vertex_order=Greedy())
+
+Embed graph `g` into a unit disk grid. The `vertex_order` can be a vector or one of the following inputs
+
+    * `Greedy()` fast but non-optimal.
+    * `Branching()` slow but optimal.
+"""
+function embed_graph(g::SimpleGraph; vertex_order=Greedy())
+    if vertex_order isa AbstractVector
+        L = PathDecomposition.Layout(g, collect(vertex_order))
+    else
+        L = pathwidth(g, vertex_order)
+    end
     ug = ugrid(g, L.vertices; padding=2, nrow=L.vsep+1)
     for e in edges(g)
-        I, J = crossat2(ug, e.src, e.dst)
+        I, J = crossat(ug, e.src, e.dst)
         @assert ug.content[I, J-1] == 1
         ug.content[I, J-1] *= -1
         if ug.content[I-1, J] == 1

src/utils.jl

@@ -1,3 +1,5 @@
+export is_independent_set, unitdisk_graph
+
 function simplegraph(edgelist::AbstractVector{Tuple{Int,Int}})
     nv = maximum(x->max(x...), edgelist)
     g = SimpleGraph(nv)
@@ -28,4 +30,25 @@ function reflectdiag(loc)
 end
 function reflectoffdiag(loc)
     loc[2], loc[1]
-end
+end
+
+function unitdisk_graph(locs::AbstractVector, unit::Real)
+    n = length(locs)
+    g = SimpleGraph(n)
+    for i=1:n, j=i+1:n
+        if sum(abs2, locs[i] .- locs[j]) < unit ^ 2
+            add_edge!(g, i, j)
+        end
+    end
+    return g
+end
+
+function is_independent_set(g::SimpleGraph, config)
+    for e in edges(g)
+        if config[e.src] == config[e.dst] == 1
+            return false
+        end
+    end
+    return true
+end
+

test/extracting_results.jl

@@ -2,7 +2,11 @@ using UnitDiskMapping, Test
 using GraphTensorNetworks
 
 @testset "map results back" begin
-    for s in (Cross{false}(), Cross{true}(), TShape{true}(), TShape{false}(), Turn())
+    for s in (Cross{false}(), Cross{true}(), Turn(), TCon(), 
+                    WTurn(), Branch(), BranchFix(), TrivialTurn(),
+                    RotatedGadget(TCon(), 1), ReflectedGadget(Cross{true}(), "y"),
+                    ReflectedGadget(TrivialTurn(), "y"), BranchFixB(),
+                    ReflectedGadget(RotatedGadget(TCon(), 1), "y"),)
         _, g0, pins0 = source_graph(s)
         locs, g, pins = mapped_graph(s)
         d1 = mapped_entry_to_compact(s)

test/gadgets.jl

@@ -21,7 +21,7 @@ using Graphs
         end
         return true, x
     end
-    for s in (Cross{false}(), Cross{true}(), TShape{true}(), TShape{false}(), Turn(),
+    for s in (Cross{false}(), Cross{true}(), Turn(),
         TrivialTurn(), Branch(), TCon(), BranchFixB(), BranchFix(), WTurn(), RotatedGadget(TCon(), 1),
         ReflectedGadget(TCon(), "x")
         )