X-Git-Url: https://code.consxy.com/gitweb/gitweb.cgi?a=blobdiff_plain;f=src%2Fmain%2Fnvm%2Fbase.lisp;h=945c5e8ea01e02dbad5d87b7ad9ba45f48960357;hb=31f7cb69edd16f175430851d696b1036b07b60f1;hp=d93089e32e7b1bacb53a7581d4cb6ef55ce197bd;hpb=bc4ccb4263ccbcc915d913c7111fdd40e2e998fe;p=clnl

diff --git a/src/main/nvm/base.lisp b/src/main/nvm/base.lisp
index d93089e..945c5e8 100644
--- a/src/main/nvm/base.lisp
+++ b/src/main/nvm/base.lisp
@@ -3,25 +3,53 @@
 (defvar *current-id* 0)
 
 (defvar *turtles* nil)
+(defvar *turtles-own-vars* nil)
+(defvar *patches-own-vars* nil)
 (defvar *patches* nil)
 (defvar *myself* nil)
 (defvar *self* nil)
 (defvar *dimensions* nil)
+(defvar *globals* 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 patch color xcor ycor)
+(define-condition stop nil nil)
+
+(defmacro with-stop-handler (&rest forms)
+ "MACRO WITH-STOP-HANDLER &rest FORMS => HANDLED-FORM
+
+ARGUMENTS AND VALUES:
+
+  FORMS: body to be handled
+  HANDLED-FORM: body with handling
+
+DESCRIPTION:
+
+  WITH-STOP-HANDLER is a convenience macro to handle when
+  programs issue a stop condition.  When one does, a simple
+  :stop is returned."
+ `(handler-case (progn ,@forms) (stop (s) (declare (ignore s)) :stop)))
+
+(defstruct turtle who color heading xcor ycor (label "") (label-color 9.9d0) (size 1d0) shape own-vars)
+(defstruct patch color xcor ycor own-vars)
 
 (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 +59,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))