Prims - Update one-of to take lists. Rename agent-set to agentset

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

diff --git a/src/main/nvm/base.lisp b/src/main/nvm/base.lisp
index 8f1595c1677d6f0c7edcac97ac7e159b25868561..cd494a7be4c012e57b8bd6067662a3b6bbe48979 100644 (file)
--- a/src/main/nvm/base.lisp
+++ b/src/main/nvm/base.lisp
@@ -13,18 +13,18 @@
 (defstruct turtle who color heading xcor ycor (label "") (label-color 9.9d0) (size 1d0))
 (defstruct patch color xcor ycor)
 
-(defun agent-set-list (agent-set)
+(defun agentset-list (agentset)
  (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))))
+  ((eql agentset :turtles) *turtles*)
+  ((eql agentset :patches) *patches*)
+  ((and (listp agentset) (eql :agentset (car agentset))) (cdr agentset))
+  (t (error "Doesn't seem to be an agentset: ~A" agentset))))
 
-(defun agent-set-p (o)
+(defun agentset-p (o)
  (or
   (eql o :turtles)
   (eql o :patches)
-  (and (listp o) (eql :agent-set (car o)))))
+  (and (listp o) (eql :agentset (car o)))))
 
 (defun agent-p (o)
  (or (turtle-p o) (patch-p o)))