new version v0.1.2

Author: Wikunia

CHANGELOG.md

@@ -1,5 +1,9 @@
 # ConstrainSolver.jl - Changelog
 
+## v0.1.2 (27th of April 2020)
+- Table constraint
+  - `@constraint(m, x in CS.TableSet(2dArr))`
+
 ## v0.1.1 (15th of April 2020)
 - CS.Integers
   - i.e `@variable(m, x, CS.Integers([1,2,5]))`

Project.toml

@@ -1,7 +1,7 @@
 name = "ConstraintSolver"
 uuid = "e0e52ebd-5523-408d-9ca3-7641f1cd1405"
 authors = ["Ole Kröger <[email protected]>"]
-version = "0.1.1"
+version = "0.1.2"
 
 [deps]
 Formatting = "59287772-0a20-5a39-b81b-1366585eb4c0"

visualizations/plot_search_space.jl

@@ -137,7 +137,7 @@ function plot_killer(grid, sums, fname; fill = true, mark = nothing)
     png("/home/ole/Julia/ConstraintSolver/visualizations/images/$(fname)")
 end
 
-function plot_str8ts(grid, white, fname)
+function plot_str8ts(grid, white, fname; search_space = nothing, only_fixed=true)
     plot(;
         size = (900, 900),
         legend = false,
@@ -148,83 +148,21 @@ function plot_str8ts(grid, white, fname)
 
     for r=1:9, c=1:9
         plot!(
-            rectangle(1, 1, r - 1, 9 - c),
+            rectangle(1, 1, c - 1, 9 - r),
             color = white[r,c] == 1 ? "white" : "black",
         )
+        x = c - 0.5
+        y = 10 - r - 0.5
         if grid[r,c] != 0
-            x = r - 0.5
-            y = 10 - c - 0.5
-            annotate!([x, y, text(string(grid[r,c]), 20, white[r,c] == 1 ? :black : :white)])
+            annotate!(x, y, text(string(grid[r,c]), 20, white[r,c] == 1 ? :black : :white))
         end
-    end
-    #=
-    for s in sums
-        ind = s.indices[1]
-        x = ind[2] - 0.75
-        y = 10 - ind[1] - 0.17
-        annotate!(x, y, text(s.result, 15, :black))
-        if mark === nothing
-            for ind in s.indices
-                plot!(rectangle(1, 1, ind[2] - 1, 9 - ind[1]), color = s.color, alpha = 0.4)
-            end
-        else
-            for ind in s.indices
-                if ind in mark
-                    plot!(
-                        rectangle(1, 1, ind[2] - 1, 9 - ind[1]),
-                        color = "red",
-                        alpha = 0.4,
-                    )
-                else
-                    plot!(
-                        rectangle(1, 1, ind[2] - 1, 9 - ind[1]),
-                        color = s.color,
-                        alpha = 0.4,
-                    )
-                end
-            end
-        end
-    end
-
-    for i in [3, 6]
-        plot!([i, i], [0, 9], color = :black, linewidth = 4)
-    end
-    for j in [3, 6]
-        plot!([0, 9], [j, j], color = :black, linewidth = 4)
-    end
-
-
-    if fill
-        for ind in keys(grid)
-            if CS.isfixed(grid[ind])
-                x = ind[2] - 0.5
-                y = 10 - ind[1] - 0.5
-                annotate!(x, y, text(value(grid[ind]), 20, :black))
-            else
-                vals = values(grid[ind])
-                sort!(vals)
-                x = ind[2] - 0.3
-                y = 10 - ind[1] - 0.2
-                max_idx = min(3, length(vals))
-                text_vals = join(vals[1:max_idx], ",")
-                annotate!(x, y, text(text_vals, 11))
-                if length(vals) > 3
-                    y -= 0.25
-                    max_idx = min(6, length(vals))
-                    text_vals = join(vals[4:max_idx], ",")
-                    annotate!(x, y, text(text_vals, 11))
-                end
-                if length(vals) > 6
-                    y -= 0.25
-                    max_idx = length(vals)
-                    text_vals = join(vals[7:max_idx], ",")
-                    annotate!(x, y, text(text_vals, 11))
-                end
-
+        if search_space !== nothing 
+            if search_space[r,c] != 0 && (search_space[r,c] isa Int || length(search_space[r,c]) == 1)
+                @assert white[r,c] == 1
+                annotate!(x, y, text(string(search_space[r,c]), 20, :blue))
             end
         end
     end
-    =#
 
     png("/home/ole/Julia/ConstraintSolver/visualizations/images/$(fname)")
 end