minor update to rule constructor

itsdfish · May 26, 2021 · f8efd52 · f8efd52
1 parent 96870f1
commit f8efd52
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "ACTRModels"
 uuid = "c095b0ea-a6ca-5cbd-afed-dbab2e976880"
 authors = ["itsdfish"]
-version = "0.6.13"
+version = "0.6.14"
 
 [deps]
 ConcreteStructs = "2569d6c7-a4a2-43d3-a901-331e8e4be471"

diff --git a/src/Structs.jl b/src/Structs.jl
@@ -372,8 +372,8 @@ Rule(;utlity=0.0, conditions, action)
 end
 
 function Rule(;utility=0.0, conditions, name="", actr, task, action, args=(), kwargs...) 
-     Rule(utility, map(x->()->x(actr, args...; kwargs...), conditions), 
-        ()->action(actr, task; kwargs...), name)
+    Rule(utility, ()->conditions(actr, args...; kwargs...), 
+    ()->action(actr, task; kwargs...), name)
 end
 
 """
@@ -418,8 +418,8 @@ function exact_match(actr)
     return rules
 end
 
-function match(rule::Rule)
-    all(c->c(), rule.conditions)
+function match(rule)
+    return rule.conditions()
 end
 
 """