Prims - Implement set-default-shape

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

diff --git a/src/main/nvm/base.lisp b/src/main/nvm/base.lisp
index d93089e32e7b1bacb53a7581d4cb6ef55ce197bd..9d07e9b1280ff677b51faf1e65993f924c59cc80 100644 (file)
--- a/src/main/nvm/base.lisp
+++ b/src/main/nvm/base.lisp
@@ -9,19 +9,27 @@
 (defvar *dimensions* nil)
 (defvar *topology* :torus)
 (defvar *ticks* nil)
+(defvar *breeds* nil)
 
-(defstruct turtle who color heading xcor ycor (label "") (label-color 9.9d0) (size 1d0))
+(defstruct turtle who color heading xcor ycor (label "") (label-color 9.9d0) (size 1d0) shape)
 (defstruct patch color xcor ycor)
 
 (defun agentset-list (agentset)
  (cond
   ((eql agentset :turtles) *turtles*)
   ((eql agentset :patches) *patches*)
-  ((and (listp agentset) (eql :agentset (car agentset))) (cdr agentset))
+  ((and (listp agentset) (eql :agentset (car agentset))) (cddr agentset))
   (t (error "Doesn't seem to be an agentset: ~A" agentset))))
 
-(defun list->agentset (list)
- (cons :agentset list))
+(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
@@ -31,3 +39,12 @@
 
 (defun agent-p (o)
  (or (turtle-p o) (patch-p o)))
+
+(defun breed-p (breed)
+ (find breed *breeds* :key #'car))
+
+(defun breed-default-shape (breed)
+ (second (find breed *breeds* :key #'car)))
+
+(defsetf breed-default-shape (breed) (shape)
+ `(setf (second (find ,breed *breeds* :key #'car)) ,shape))