fix applying optimizers

Author: GiggleLiu

src/mapping.jl

@@ -95,8 +95,8 @@ end
 function apply_simplifier_gadgets!(ug::UGrid; ruleset, nrepeat::Int=10)
     tape = Tuple{Pattern,Int,Int}[]
     for _ in 1:nrepeat, pattern in ruleset
-        for j=0:size(ug.content, 1)  # start from 0 because there can be one empty padding column/row.
-            for i=0:size(ug.content, 2)
+        for j=0:size(ug.content, 2)  # start from 0 because there can be one empty padding column/row.
+            for i=0:size(ug.content, 1)
                 if match(pattern, ug.content, i, j)
                     apply_gadget!(pattern, ug.content, i, j)
                     push!(tape, (pattern, i, j))

test/mapping.jl

@@ -40,7 +40,7 @@ end
         mis_overhead1 = sum(x->mis_overhead(x[1]), tape)
         mis_overhead2 = sum(x->mis_overhead(x[1]), tape2)
         @show mis_overhead2
-        gp = Independence(SimpleGraph(ug3); optimizer=TreeSA(ntrials=1, niters=10), simplifier=MergeGreedy())
+        gp = Independence(SimpleGraph(ug3); optimizer=GreedyMethod(nrepeat=10), simplifier=MergeGreedy())
         missize_map = solve(gp, "size max")[].n
         missize = solve(Independence(g), "size max")[].n
         @test mis_overhead0 + mis_overhead1 + mis_overhead2 + missize == missize_map