From ff4b9d9800b4ce7ab820c06db0ab56936f546ed6 Mon Sep 17 00:00:00 2001 From: Helmut Merz Date: Mon, 27 Jul 2026 22:18:30 +0200 Subject: [PATCH] csys: creation of pred (sensor) and succ (effector) for zero OK --- csys/csys.lisp | 2 +- test/test-csys.lisp | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/csys/csys.lisp b/csys/csys.lisp index 3527f3f..f279e99 100644 --- a/csys/csys.lisp +++ b/csys/csys.lisp @@ -193,5 +193,5 @@ (let ((data (shape:data msg))) (actor:send rcvr (message:create (list (message:domain msg) :connect) - :data (list :target (getf data :target) + :data (list :target target :op (getf data :op)))))) diff --git a/test/test-csys.lisp b/test/test-csys.lisp index 9d92b0d..6e2a2f9 100644 --- a/test/test-csys.lisp +++ b/test/test-csys.lisp @@ -63,13 +63,11 @@ ;;;; test-specific programs / actions ;;;; (move to scopes/csys/programs) -(defun test-program () - (csys:make-program (csys:eff-proc :actions (actions-zero-initial)))) - (defun prog-b0 () (csys:make-program - (list '(:c00 :initial) (csys:eff-proc :actions (actions-zero-initial)) - ':default (csys:std-proc)))) + (list '(:c00 :initial) (csys:std-proc :actions (actions-zero-initial)) + '(:e01 :initial) (csys:eff-proc :actions (csys:basic-actions)) + ':default (csys:std-proc :actions (csys:basic-actions))))) (defun actions-zero-initial () (let ((acts (csys:basic-actions))) @@ -80,10 +78,10 @@ (lambda (msg scope) (let ((head '(:csys :create :c00 "0-0"))) (actor:send actor:*self* - (message:create head :data '(:categ (:csys :e01)))) + (message:create head :data '(:categ (:csys :e01) :connect :succ))) (actor:send actor:*self* - (message:create head :data '(:addr (:csys :s01 "0-1")))) - ;; create :succ :e01; create :pred :s01; connect *self* :op (multiply -1) + (message:create head :data '(:addr (:csys :s01 "0-1") :connect :pred))) + ;; connect *self* :op (multiply -1) ;; switch :active nil))) @@ -93,7 +91,7 @@ (let ((env (setup-test (prog-b0))) (rcvr (tc:receiver t:*test-suite*))) (sleep 0.1) - (tc:expect rcvr (message:create '(:csys :effect :c00) :data '(:value 1))) - (actor:send env (message:create '(:csys :value :c00 "0-0") :data '(:value 1))) + (tc:expect rcvr (message:create '(:csys :effect :e01) :data '(:value 1))) + (actor:send env (message:create '(:csys :value :s01 "0-1") :data '(:value 1))) (sleep 0.1) (core:shutdown)))