cco/cl-scopes
3
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity Actions

use :effect action as output from effector neuron; action handling improvements

Browse source
This commit is contained in:
Helmut Merz 2026-07-24 16:23:52 +02:00
parent b773e0aedb
commit 6facc4f22e
4 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
csys/csys.lisp
View file

@ -76,14 +76,14 @@
(defun std-proc (msg scope &key (default #'remember) params actions) (defun std-proc (msg scope &key (default #'remember) params actions)
(util:mv-bind (nmsg (nscope scope)) (util:mv-bind (nmsg (nscope scope))
(handle-action msg scope :default default :actions actions :params params) (handle-action msg scope :default default :actions actions :params params)
(forward nmsg (syns nscope)) (when nmsg (forward nmsg (syns nscope)))
(update nscope))) (update nscope)))
(defun eff-proc (msg scope &key params actions) (defun eff-proc (msg scope &key params actions)
(util:mv-bind (nmsg (nscope scope)) (util:mv-bind (nmsg (nscope scope))
(handle-action msg scope :default #'no-op :actions actions :params params) (handle-action msg scope :default (no-op) :actions actions :params params)
(setf (nth 1 (shape:head nmsg)) :notify) (setf (nth 1 (shape:head nmsg)) :effect)
(notify nmsg nscope) (when nmsg (notify nmsg nscope))
(update nscope))) (update nscope)))
(defun create (msg scope) (defun create (msg scope)
@ -100,7 +100,7 @@
(dolist (s syns) (dolist (s syns)
(funcall s msg))) (funcall s msg)))
(defun handle-action (msg scope &key (default #'no-op) actions params) (defun handle-action (msg scope &key (default (no-op)) actions params)
(let* ((key (message:action msg)) (let* ((key (message:action msg))
(act (getf actions key (getf actions :default default)))) (act (getf actions key (getf actions :default default))))
(apply act msg scope params))) (apply act msg scope params)))
@ -113,7 +113,9 @@
;;;; predefined neuron actions ;;;; predefined neuron actions
(defun no-op (msg scope) msg) (defun no-op (&key stop)
(lambda (msg scope)
(unless stop msg)))
(defun remember (msg scope) (defun remember (msg scope)
(setf (value scope) (shape:data-value msg :value)) (setf (value scope) (shape:data-value msg :value))

6
csys/environ.lisp
View file

@ -25,8 +25,10 @@
(defun actions () (defun actions ()
(list :created #'cell-created (list :created #'cell-created
:notify #'csys:no-op :notify (csys:no-op)
:default #'forward)) :effect (csys:no-op)
:value #'forward
:default (csys:no-op :stop t)))
(defun cell-created (msg scope) (defun cell-created (msg scope)
(let* ((data (shape:data msg)) (let* ((data (shape:data msg))

1
test/test-core.lisp
View file

@ -37,7 +37,6 @@
(defun check-message (ctx msg) (defun check-message (ctx msg)
(let ((key (shape:head msg)) (let ((key (shape:head msg))
(t:*test-suite* (suite ctx))) (t:*test-suite* (suite ctx)))
(util:lgi (expected ctx))
(multiple-value-bind (val found) (gethash key (expected ctx)) (multiple-value-bind (val found) (gethash key (expected ctx))
(if found (if found
(progn (progn

6
test/test-csys.lisp
View file

@ -29,8 +29,8 @@
(defun setup-config () (defun setup-config ()
(config:add :test-receiver :setup #'tc:setup) (config:add :test-receiver :setup #'tc:setup)
;(config:add-action '(:csys :notify :c00 "0-0") (value-in '(1))) ;(config:add-action '(:csys :effect :c00 "0-0") (value-in '(1)))
(config:add-action '(:csys :notify) #'tc:check-message) (config:add-action '(:csys :effect) #'tc:check-message)
(config:add-action '(:csys) (constantly nil)) (config:add-action '(:csys) (constantly nil))
) )
@ -68,7 +68,7 @@
(let ((env (setup-test (csys:make-program #'csys:eff-proc))) (let ((env (setup-test (csys:make-program #'csys:eff-proc)))
(rcvr (tc:receiver t:*test-suite*))) (rcvr (tc:receiver t:*test-suite*)))
(sleep 0.1) (sleep 0.1)
(tc:expect rcvr (message:create '(:csys :notify :c00 "0-0") :data '(:value 1))) (tc:expect rcvr (message:create '(:csys :effect :c00 "0-0") :data '(:value 1)))
(actor:send env (message:create '(:csys :value :c00 "0-0") :data '(:value 1))) (actor:send env (message:create '(:csys :value :c00 "0-0") :data '(:value 1)))
(sleep 0.1) (sleep 0.1)
(core:shutdown))) (core:shutdown)))