Create looping-mixin

shop-planner · Aug 24, 2023 · f3adfb8 · f3adfb8
1 parent ee93b76
commit f3adfb8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/shop3/looping-tasks/conditional-extensions.lisp b/shop3/looping-tasks/conditional-extensions.lisp
@@ -35,7 +35,7 @@
         (unifier state) (unifier entry))
   (decf (depth state)))
 
-(defmethod expand-conditional-task ((domain looping-domain)
+(defmethod expand-conditional-task ((domain looping-mixin)
                              ess-search-state)
   (trace-print :loop domain ess-search-state "~%Expanding the conditional now...")
   (with-slots (top-tasks tasks current-task
@@ -186,7 +186,7 @@
       (setf reduction `(:ordered (:task !!inop))))
     reduction))
 
-(defmethod seek-plans-conditional ((domain looping-domain) task1 state tasks
+(defmethod seek-plans-conditional ((domain looping-mixin) task1 state tasks
 				    top-tasks partial-plan partial-plan-cost depth
 				    which-plans protections
 				    in-unifier)

diff --git a/shop3/looping-tasks/exts-common.lisp b/shop3/looping-tasks/exts-common.lisp
@@ -1,11 +1,14 @@
 (in-package :shop)
 
-(defclass looping-domain (domain)
-     ()
+(defclass looping-mixin ()
+  ()
   (:documentation "Mixin domain class for HTNs with LOOP tasks in them."))
 
+(defclass looping-domain (looping-mixin domain)
+  ())
 
-(defmethod seek-plans-task ((domain looping-domain) task1 state tasks
+
+(defmethod seek-plans-task ((domain looping-mixin) task1 state tasks
                             top-tasks
                             partial-plan
                             partial-plan-cost depth which-plans

diff --git a/shop3/looping-tasks/loop-extensions.lisp b/shop3/looping-tasks/loop-extensions.lisp
@@ -31,7 +31,7 @@
         (unifier state) (unifier entry))
   (decf (depth state)))
 
-(defmethod unfold-loop-task ((domain looping-domain)
+(defmethod unfold-loop-task ((domain looping-mixin)
                              ess-search-state)
   (shop-trace "Unfolding now...~%")
   (with-slots (top-tasks tasks current-task
@@ -306,7 +306,7 @@
     ;; RETURN
     unfolded-loop))
 
-(defmethod seek-plans-loop ((domain looping-domain) task1 state tasks
+(defmethod seek-plans-loop ((domain looping-mixin) task1 state tasks
                             top-tasks partial-plan partial-plan-cost depth
                             which-plans protections
                             in-unifier)