Merge pull request 0xc1c4da#5 from rasom/rasom-deriver

Multiple defrules

src/nal/deriver/rules.clj

@@ -119,22 +119,26 @@
 
 (defmacro defrules
   "Define rules. Rules must be #R statements."
-  ;TODO exception on duplication of the rule
   [name & rules]
-  `(time
-     (let [rules# (rules->> (quote ~rules)
-                            contains-list? generate-all-lists
-                            contains-list? generate-all-lists
-                            identity rule
-                            order-for-all-same? generate-all-orders
-                            allow-swapping? swap
-                            allow-backward? expand-backward-rules)
-           judgement-rules# (check-duplication (filter judgement? rules#))
-           question-rules# (check-duplication (filter question? rules#))
-           goal-rules# (check-duplication (filter goal? rules#))]
-       (println "Q rules:" (count question-rules#))
-       (println "J rules:" (count judgement-rules#))
-       (println "G rules:" (count goal-rules#))
-       (def ~name {:judgement (rules-map judgement-rules# :judgement)
-                   :question  (rules-map question-rules# :question)
-                   :goal      (rules-map goal-rules# :goal)}))))
+  `(def ~name (quote ~rules)))
+
+(defn compile-rules
+  ;TODO exception on duplication of the rule
+  [& rules]
+  (time
+    (let [rules (rules->> (apply concat rules)
+                          contains-list? generate-all-lists
+                          contains-list? generate-all-lists
+                          identity rule
+                          order-for-all-same? generate-all-orders
+                          allow-swapping? swap
+                          allow-backward? expand-backward-rules)
+          judgement-rules# (check-duplication (filter judgement? rules))
+          question-rules# (check-duplication (filter question? rules))
+          goal-rules# (check-duplication (filter goal? rules))]
+      (println "Q rules:" (count question-rules#))
+      (println "J rules:" (count judgement-rules#))
+      (println "G rules:" (count goal-rules#))
+      {:judgement (rules-map judgement-rules# :judgement)
+       :question  (rules-map question-rules# :question)
+       :goal      (rules-map goal-rules# :goal)})))

src/nal/rules.clj

@@ -1,10 +1,10 @@
 (ns nal.rules
-  (:require [nal.deriver.rules :refer [defrules]]
+  (:require [nal.deriver.rules :refer [defrules compile-rules]]
             nal.reader))
 
 (declare --S S --P P <-> |- --> ==> M || && =|> -- A Ai B <=>)
 
-(defrules rules
+(defrules all-rules
   ;Similarity to Inheritance
   #R[(S --> P) (S <-> P) |- (S --> P) :post (:t/struct-int :p/judgement) :pre (:question?)]
   ;Inheritance to Similarity
@@ -451,6 +451,8 @@
   #R[(|| B :list/A) B |- (|| B :list/A) :pre (:question?) :post (:t/belief-structural-deduction :p/judgement)]
 )
 
+(def rules (compile-rules all-rules))
+
 (defn freq [task-type]
   "Check frequency"
   (into {} (map (fn [[k v]] [(str k) (count (:rules v))]) (task-type rules))))