X-Git-Url: https://code.consxy.com/gitweb/gitweb.cgi?a=blobdiff_plain;f=src%2Fmain%2Fnvm%2Fbase.lisp;h=ba895e38456f65da034ceee932b860125cc56001;hb=083d6c2;hp=228853767bde0968e763e7bd955314db5805e4e0;hpb=c11c429d212f7a08391cc117b9facd938cd80e63;p=clnl

diff --git a/src/main/nvm/base.lisp b/src/main/nvm/base.lisp
index 2288537..ba895e3 100644
--- a/src/main/nvm/base.lisp
+++ b/src/main/nvm/base.lisp
@@ -10,8 +10,31 @@
 (defvar *topology* :torus)
 (defvar *ticks* nil)
 
-(defstruct turtle who color heading xcor ycor)
+(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)
- agent-set)
+(defun agentset-list (agentset)
+ (cond
+  ((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)))