X-Git-Url: https://code.consxy.com/gitweb/gitweb.cgi?a=blobdiff_plain;f=src%2Fmain%2Fnvm%2Fbase.lisp;h=ba895e38456f65da034ceee932b860125cc56001;hb=1dd12dd;hp=1df5022fbc08c73d4adb3d5131cc356566dc9c0c;hpb=3528ea770bf54e0174976c48b64e036355b71601;p=clnl

diff --git a/src/main/nvm/base.lisp b/src/main/nvm/base.lisp
index 1df5022..ba895e3 100644
--- a/src/main/nvm/base.lisp
+++ b/src/main/nvm/base.lisp
@@ -13,9 +13,28 @@
 (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))) (cddr agentset))
+  (t (error "Doesn't seem to be an agentset: ~A" agentset))))
+
+(defun agentset-breed (agentset)
+ (cond
+  ((eql agentset :turtles) :turtles)
+  ((eql agentset :patches) :patches)
+  ((and (listp agentset) (eql :agentset (car agentset))) (second agentset))
+  (t (error "Doesn't seem to be an agentset: ~A" agentset))))
+
+(defun list->agentset (list breed)
+ (append (list :agentset breed) list))
+
+(defun agentset-p (o)
+ (or
+  (eql o :turtles)
+  (eql o :patches)
+  (and (listp o) (eql :agentset (car o)))))
+
+(defun agent-p (o)
+ (or (turtle-p o) (patch-p o)))