wrote tests for ASP functionality.

Author: Issa Hanou

.gitignore

@@ -23,3 +23,5 @@ docs/site/
 # environment.
 Manifest.toml
 
+# Files generated by ASPSolver
+*.lp

src/HerbConstraints.jl

@@ -59,6 +59,10 @@ include("solver/uniform_solver/uniform_solver.jl")
 include("solver/uniform_solver/uniform_treemanipulations.jl")
 include("solver/domainutils.jl")
 
+include("solver/uniform_solver/asp/asp_tree_transformations.jl")
+include("solver/uniform_solver/asp/asp_constraint_transformations.jl")
+include("solver/uniform_solver/asp/asp_uniform_tree_solver.jl")
+
 include("patternmatch.jl")
 include("lessthanorequal.jl")
 include("makeequal.jl")
@@ -148,4 +152,10 @@ export
     StateHole,
     freeze_state
 
+    #asp uniform solver
+    tree_to_ASP,
+    constraint_tree_to_ASP,
+    to_ASP,
+    ASPSolver
+
 end # module HerbConstraints

src/solver/uniform_solver/asp/asp_constraint_transformations.jl

@@ -45,7 +45,7 @@ Transforms the contains constraint into ASP format.
 Contains(4) -> :- not node(_,4).
 """
 function to_ASP(grammar::AbstractGrammar, constraint::Contains, constraint_index::Int64)
-    return ":- not node(_, $(constraint.rule)).\n"
+    return ":- not node(_,$(constraint.rule)).\n"
 end
 
 """
@@ -56,7 +56,7 @@ Transforms the unique constraint into ASP format.
 Unique(4) -> { node(X,4) : node(X,4) } 1.
 """
 function to_ASP(grammar::AbstractGrammar, constraint::Unique, constraint_index::Int64)
-    return "{ node(X, $(constraint.rule)) : node(X, $(constraint.rule)) } 1.\n"
+    return "{ node(X,$(constraint.rule)) : node(X,$(constraint.rule)) } 1.\n"
 end
 
 """
@@ -95,16 +95,16 @@ is_smaller(X,Y) :- node(X,XV), node(Y,YV), XV = YV, S = #sum {Z: child(X,Z,XC),
 :- node(X1,5),child(X1,1,X),child(X1,2,Y),child(X1,3,Z) not is_smaller(Y,Z).
 """
 function to_ASP(grammar::AbstractGrammar, constraint::Ordered, constraint_index::Int64)
-    output = "is_smaller(X,Y) :- node(X,XV), node(Y,YV), XV < YV.\n"
-    output *= "is_smaller(X,Y) :- node(X,XV), node(Y,YV), XV = YV, S = #sum {Z: child(X,Z,XC), child(Y,Z,YC), is_smaller(XC, YC)}, M = #max {Z: child(X,Z,XC)}, S = M.\n"
+    output = "is_smaller(X,Y) :- node(X,XV),node(Y,YV),XV < YV.\n"
+    output *= "is_smaller(X,Y) :- node(X,XV),node(Y,YV),XV = YV,S = #sum { Z : child(X,Z,XC),child(Y,Z,YC),is_smaller(XC,YC) }, M = #max { Z : child(X,Z,XC) }, S = M.\n"
 
     tree, domains, _ = constraint_tree_to_ASP(grammar, constraint.tree, 1, constraint_index)
 
     output *= domains
 
     # create ordered constraints, for each consecutive pair of ordered vars
     for i in 1:length(constraint.order)-1
-        output *= ":- $(tree), not is_smaller($(constraint.order[i]), $(constraint.order[i+1])).\n"
+        output *= ":- $(tree),not is_smaller($(constraint.order[i]),$(constraint.order[i+1])).\n"
     end
 
     return output

src/solver/uniform_solver/asp/asp_test.jl

@@ -71,7 +71,7 @@ end
   node_to_ASP(tree::StateHole, grammar::AbstractGrammar, node_index::Int64)
 
 Transform a [StateHole] into an ASP representation in the form
-`1 { node(node_index, rule_id_1); node(node_index, rule_id_2);...}1.`
+`1 { node(node_index, rule_id_1); node(node_index, rule_id_2);...} 1.`
 """
 function node_to_ASP(tree::StateHole, grammar::AbstractGrammar, node_index::Int64)
     options = join(["node($(node_index),$(ind))" for ind in Base.findall(tree.domain)], ";")
@@ -90,7 +90,7 @@ Transforms a template tree to an ASP form suitable for constraints.
 function constraint_tree_to_ASP(grammar::AbstractGrammar, tree::AbstractRuleNode, node_index::Int64, constraint_index::Int64)
     tree_facts, additional_facts = "", ""
     tmp_facts, tmp_additional = constraint_node_to_ASP(grammar, tree, node_index, constraint_index::Int64)
-    tree_facts *= tmp_facts
+    tree_facts *= "$(tmp_facts)"
     additional_facts *= join(tmp_additional, "")
     parent_index = node_index
     node_index += 1
@@ -128,7 +128,7 @@ Transforms a [UniformHole] or [DomainRuleNode] into an ASP representation in the
 and the allowed domains of this constraint node.
 """
 function constraint_node_to_ASP(grammar::AbstractGrammar, node::Union{UniformHole,DomainRuleNode}, node_index::Int64, constraint_index::Int64)
-    return "node(X$(node_index),D$(node_index)),allowed(c$(constraint_index)x$(node_index),D$(node_index))", map(x -> "allowed(c$(constraint_index)x$(node_index), $x).\n", collect(filter(x -> node.domain[x], 1:length(grammar.rules))))
+    return "node(X$(node_index),D$(node_index)),allowed(c$(constraint_index)x$(node_index),D$(node_index))", map(x -> "allowed(c$(constraint_index)x$(node_index),$x).\n", collect(filter(x -> node.domain[x], 1:length(grammar.rules))))
 end
 
 """
@@ -139,5 +139,5 @@ Transforms a [StateHole] into an ASP representation in the form
 and the allowed domains of this constraint node.
 """
 function constraint_node_to_ASP(grammar::AbstractGrammar, node::StateHole, node_index::Int64, constraint_index::Int64)
-    return "node(X$(node_index),D$(node_index)),allowed(c$(constraint_index)x$(node_index),D$(node_index))", map(x -> "allowed(c$(constraint_index)x$(node_index), $x).\n", Base.findall(node.domain))
+    return "node(X$(node_index),D$(node_index)),allowed(c$(constraint_index)x$(node_index),D$(node_index))", map(x -> "allowed(c$(constraint_index)x$(node_index),$x).\n", Base.findall(node.domain))
 end

src/solver/uniform_solver/asp/asp_tree_transformations.jl

@@ -55,17 +55,13 @@ end
 function extract_solutions(solver::ASPSolver, output_lines)
     current_solution = Dict{Int64,Int64}()
     for line in output_lines
-        if startswith(line, "Answer")
-            if !isempty(current_solution)
-                push!(solver.solutions, current_solution)
-            end
-            current_solution = Dict{Int64,Int64}()
-        elseif startswith(line, "node")
+        if startswith(line, "node")
             node_assignments = split(line, " ")
             for node in node_assignments
                 m = match(r"node\((\d+),(\d+)\)", node)
                 current_solution[parse(Int, m.captures[1])] = parse(Int, m.captures[2])
             end
+            push!(solver.solutions, current_solution)
         elseif startswith(line, "SATISFIABLE")
             break
         end