Make agentsets annotated lists, Implement count

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

diff --git a/src/main/nvm/base.lisp b/src/main/nvm/base.lisp
index 228853767bde0968e763e7bd955314db5805e4e0..1df5022fbc08c73d4adb3d5131cc356566dc9c0c 100644 (file)
--- a/src/main/nvm/base.lisp
+++ b/src/main/nvm/base.lisp
@@ -10,8 +10,12 @@
 (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)
+ (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))))