Prims - Update ask, of to take agents

[clnl] / src / main / nvm / base.lisp

diff --git a/src/main/nvm/base.lisp b/src/main/nvm/base.lisp
index 9c49c9900bbd35d308e837fbeabc47dbb8a44193..8f1595c1677d6f0c7edcac97ac7e159b25868561 100644 (file)
--- a/src/main/nvm/base.lisp
+++ b/src/main/nvm/base.lisp
@@ -14,4 +14,17 @@
 (defstruct patch color xcor ycor)
 
 (defun agent-set-list (agent-set)
- agent-set)
+ (cond
+  ((eql agent-set :turtles) *turtles*)
+  ((eql agent-set :patches) *patches*)
+  ((and (listp agent-set) (eql :agent-set (car agent-set))) (cdr agent-set))
+  (t (error "Doesn't seem to be an agent-set: ~A" agent-set))))
+
+(defun agent-set-p (o)
+ (or
+  (eql o :turtles)
+  (eql o :patches)
+  (and (listp o) (eql :agent-set (car o)))))
+
+(defun agent-p (o)
+ (or (turtle-p o) (patch-p o)))