From 2c036222ca50b8e3d009defa0fd2d7a53aa6a5bd Mon Sep 17 00:00:00 2001 From: "Robert P. Goldman" Date: Thu, 30 Mar 2023 13:09:29 -0500 Subject: [PATCH 1/2] Bump versions. Bump Monroe version for new, portable randomization and require SHOP3 version that is compatible. --- src/monroe.asd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/monroe.asd b/src/monroe.asd index b111808..4805ada 100644 --- a/src/monroe.asd +++ b/src/monroe.asd @@ -3,14 +3,14 @@ ) (in-package :monroe-asd) (defsystem monroe - :depends-on ("shop3") + ;; need new version of SHOP3 with its own random function + :depends-on ((:version "shop3" "4")) :license "BSD 3-clause" - :serial t - :version "3.1" + :serial tg + :version "4.0.0" :components ((:file "package") (:file "nlib") ;; my library (:file "config") - ;; (:file "shop2random") ;; planner (:file "planlib") ;; code for generating plan lib (:file "monroe_plib") ;; plan library (:file "monroe_state") ;; state From 2b09a5b947b98a0f4b391fcb197fc79b16cf84c2 Mon Sep 17 00:00:00 2001 From: "Robert P. Goldman" Date: Fri, 31 Mar 2023 12:09:14 -0500 Subject: [PATCH 2/2] Fix bug with package designators. Allegro seems to be willing to bind *PACKAGE* to a package-designator, but SBCL requires a real package. --- src/config.lisp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/config.lisp b/src/config.lisp index deee9c7..c872c47 100644 --- a/src/config.lisp +++ b/src/config.lisp @@ -7,7 +7,7 @@ ) (plan-package :initarg :plan-package - :reader plan-package + :type (or package string symbol) ) (domain-name :initarg :domain-name @@ -56,6 +56,12 @@ subgoals")) the domain so things like GET-TO will just be 1 schema, even though there are many different method bodies.")) +(defmethod plan-package ((obj monroe-config)) + (with-slots (plan-package) obj + (etypecase plan-package + (package plan-package) + ((or symbol string) (uiop:find-package* plan-package))))) + ;;; specials (declaim (special *top-goals* *flat-output*)) (defvar *problem-filename*