projects
/
clnl
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Code - patches-own
[clnl]
/
src
/
main
/
nvm
/
nvm.lisp
diff --git
a/src/main/nvm/nvm.lisp
b/src/main/nvm/nvm.lisp
index dcba15148fee16839967859fd016dea94fb50a6c..42a269a35be376cb7ab50b8bdf70e1163026b62c 100644
(file)
--- a/
src/main/nvm/nvm.lisp
+++ b/
src/main/nvm/nvm.lisp
@@
-647,12
+647,13
@@
DESCRIPTION:
(defun clear-ticks ()
(setf *ticks* nil))
(defun clear-ticks ()
(setf *ticks* nil))
-(defun create-world (&key dims globals turtles-own-vars)
- "CREATE-WORLD &key DIMS GLOBALS TURTLES-OWN-VARS => RESULT
+(defun create-world (&key dims globals turtles-own-vars
patches-own-vars
)
+ "CREATE-WORLD &key DIMS GLOBALS TURTLES-OWN-VARS
PATCHES-OWN-VARS
=> RESULT
DIMS: (:xmin XMIN :xmax XMAX :ymin YMIN :ymax YMAX)
GLOBALS: GLOBAL*
TURTLES-OWN-VARS: TURTLES-OWN-VAR*
DIMS: (:xmin XMIN :xmax XMAX :ymin YMIN :ymax YMAX)
GLOBALS: GLOBAL*
TURTLES-OWN-VARS: TURTLES-OWN-VAR*
+ PATCHES-OWN-VARS: PATCHES-OWN-VAR*
GLOBAL: (GLOBAL-NAME GLOBAL-ACCESS-FUNC)
ARGUMENTS AND VALUES:
GLOBAL: (GLOBAL-NAME GLOBAL-ACCESS-FUNC)
ARGUMENTS AND VALUES:
@@
-663,6
+664,7
@@
ARGUMENTS AND VALUES:
YMIN: An integer representing the minimum patch coord in Y
YMAX: An integer representing the maximum patch coord in Y
TURTLES-OWN-VAR: Symbol for the turtles own variable in the keyword package
YMIN: An integer representing the minimum patch coord in Y
YMAX: An integer representing the maximum patch coord in Y
TURTLES-OWN-VAR: Symbol for the turtles own variable in the keyword package
+ PATCHES-OWN-VAR: Symbol for the patches own variable in the keyword package
GLOBAL-NAME: Symbol for the global in the keyword package
GLOBAL-ACCESS-FUNC: Function to get the value of the global
GLOBAL-NAME: Symbol for the global in the keyword package
GLOBAL-ACCESS-FUNC: Function to get the value of the global
@@
-673,6
+675,7
@@
DESCRIPTION:
This should be called before using the engine in any real capacity. If
called when an engine is already running, it may do somethign weird."
(setf *turtles-own-vars* turtles-own-vars)
This should be called before using the engine in any real capacity. If
called when an engine is already running, it may do somethign weird."
(setf *turtles-own-vars* turtles-own-vars)
+ (setf *patches-own-vars* patches-own-vars)
(setf *dimensions* dims)
(setf *globals* globals)
(setf *breeds* (list (list :turtles "default")))
(setf *dimensions* dims)
(setf *globals* globals)
(setf *breeds* (list (list :turtles "default")))
@@
-774,14
+777,16
@@
DESCRIPTION:
(append
(list
"\"PATCHES\""
(append
(list
"\"PATCHES\""
- "\"pxcor\",\"pycor\",\"pcolor\",\"plabel\",\"plabel-color\"")
+ (format nil "\"pxcor\",\"pycor\",\"pcolor\",\"plabel\",\"plabel-color\"~{,\"~A\"~}"
+ (mapcar #'string-downcase *patches-own-vars*)))
(mapcar
(lambda (patch)
(format nil
(mapcar
(lambda (patch)
(format nil
- "\"~A\",\"~A\",\"~A\",\"\"\"\"\"\",\"9.9\""
+ "\"~A\",\"~A\",\"~A\",\"\"\"\"\"\",\"9.9\"
~{,\"~A\"~}
"
(dump-object (patch-xcor patch))
(dump-object (patch-ycor patch))
(dump-object (patch-xcor patch))
(dump-object (patch-ycor patch))
- (dump-object (patch-color patch))))
+ (dump-object (patch-color patch))
+ (mapcar #'dump-object (mapcar (lambda (var) (agent-value-inner patch var)) *patches-own-vars*))))
*patches*)))
(defun export-world ()
*patches*)))
(defun export-world ()