csys: simplify setup / initialization in test
This commit is contained in:
parent
de72fe9aaf
commit
cd62c8eed4
2 changed files with 12 additions and 17 deletions
|
|
@ -8,11 +8,10 @@
|
||||||
(:shape :scopes/shape)
|
(:shape :scopes/shape)
|
||||||
(:util :scopes/util)
|
(:util :scopes/util)
|
||||||
(:alx :alexandria))
|
(:alx :alexandria))
|
||||||
(:export #:environment #:*environment* #:procs
|
(:export #:environment #:*environment* #:actions #:procs #:sensors
|
||||||
#:init
|
|
||||||
#:send #:send-message
|
#:send #:send-message
|
||||||
#:neuron #:synapse
|
#:neuron #:synapse #:std-proc
|
||||||
#:make-neuron #:update-neuron
|
#:make-neuron #:update-neuron #:create-sensor
|
||||||
#:handle-action))
|
#:handle-action))
|
||||||
|
|
||||||
(in-package :scopes/csys)
|
(in-package :scopes/csys)
|
||||||
|
|
@ -28,13 +27,6 @@
|
||||||
|
|
||||||
(defvar *environment* (make-instance 'environment))
|
(defvar *environment* (make-instance 'environment))
|
||||||
|
|
||||||
(defun init ()
|
|
||||||
(setf (gethash :sensor (actions *environment*)) #'create-sensor)
|
|
||||||
(setf (gethash :default (procs *environment*)) #'std-proc)
|
|
||||||
(let* ((eff-proc (gethash '(:effect :default) (procs *environment*) #'std-proc))
|
|
||||||
(zero (make-neuron nil :proc eff-proc)))
|
|
||||||
(setf (gethash '(:init :zero) (sensors *environment*)) (list zero))))
|
|
||||||
|
|
||||||
;;;; neurons (= behavior factories) and synapses (connection factories)
|
;;;; neurons (= behavior factories) and synapses (connection factories)
|
||||||
|
|
||||||
(defun neuron (proc &optional state syns (env *environment*))
|
(defun neuron (proc &optional state syns (env *environment*))
|
||||||
|
|
@ -89,7 +81,6 @@
|
||||||
(defun do-log (msg state syns env)
|
(defun do-log (msg state syns env)
|
||||||
(util:lgi msg))
|
(util:lgi msg))
|
||||||
|
|
||||||
|
|
||||||
;;;; helper / utility funtions
|
;;;; helper / utility funtions
|
||||||
|
|
||||||
(defun forward (msg syns)
|
(defun forward (msg syns)
|
||||||
|
|
|
||||||
|
|
@ -52,16 +52,20 @@
|
||||||
(sleep 0.1)
|
(sleep 0.1)
|
||||||
(t:show-result))))
|
(t:show-result))))
|
||||||
|
|
||||||
;;;; tests
|
;;;; test: initialization
|
||||||
|
|
||||||
|
(defun init ()
|
||||||
|
(setf (gethash :sensor (csys:actions csys:*environment*)) #'csys:create-sensor)
|
||||||
|
(let ((zero (csys:make-neuron nil :proc #'eff-proc)))
|
||||||
|
(setf (gethash '(:init :zero) (csys:sensors csys:*environment*)) (list zero))))
|
||||||
|
|
||||||
(deftest test-init ()
|
(deftest test-init ()
|
||||||
(let ((csys:*environment* (make-instance 'test-env :test-suite t:*test-suite*))
|
(let ((csys:*environment* (make-instance 'test-env :test-suite t:*test-suite*)))
|
||||||
rcvr)
|
;(setup-xxx)
|
||||||
(setf (gethash '(:effect :default) (csys:procs csys:*environment*)) #'eff-proc)
|
|
||||||
(setup-config)
|
(setup-config)
|
||||||
(core:setup-services)
|
(core:setup-services)
|
||||||
(setf (tc:receiver t:*test-suite*) (core:find-service :test-receiver))
|
(setf (tc:receiver t:*test-suite*) (core:find-service :test-receiver))
|
||||||
(csys:init)
|
(init) ; end of setup
|
||||||
(csys:send-message '(:csys :sensor :init :zero) '(:std :s1))
|
(csys:send-message '(:csys :sensor :init :zero) '(:std :s1))
|
||||||
(csys:send-message '(:csys :sensor :init :zero) '(:std :s2))
|
(csys:send-message '(:csys :sensor :init :zero) '(:std :s2))
|
||||||
(sleep 0.1)
|
(sleep 0.1)
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue