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

Compare commits

base: cco:e2d82fed8fab0ca860dc018ad3fc238ece0ddb69
Branches Tags
cco:master
..
compare: cco:0bf199388aafc4f404681fdc3c2774289f835246
Branches Tags
cco:master

No commits in common. "e2d82fed8fab0ca860dc018ad3fc238ece0ddb69" and "0bf199388aafc4f404681fdc3c2774289f835246" have entirely different histories.
e2d82fed8f ... 0bf199388a

3 changed files with 35 additions and 22 deletions
Show stats Expand all files Collapse all files

14
csys/environ.lisp
View file

@ -102,12 +102,9 @@
;;;; public shortcuts
(defun send-message (head data &key (env *env*))
(actor:send env (message:create head :data data)))
(defun send-value (cat-loc val &key (domain csys:*domain*) (env *env*))
(defun send-value (cat-loc val &key (domain csys:*domain*) (env *env*) delay)
(let ((head (cons domain (cons :value cat-loc))))
(send-message head `(:value ,val) :env env)))
(actor:send env (message:create head :data `(:value ,val)))))
(defun send-connect (rcvr target &key (domain csys:*domain*) (env *env*) op)
(let* ((cat-loc (when (listp rcvr) rcvr))
@ -117,7 +114,12 @@
(when (and (listp target) (< (length target) 3))
(setf target (cons domain target)))
(util:plist-add data :target target)
(send-message head data :env env)))
(util:lgi rcvr target cat-loc head data)
(actor:send env (message:create head :data data))))
(defun x-send-connect (env &rest args &key (domain csys:*domain*) to target op)
(let ((head (list domain :connect)))
(actor:send env (message:create head :data args))))
;;;; internal helpers

12
csys/program/basic.lisp
View file

@ -54,8 +54,12 @@
(defun b1-next-one ()
(lambda (msg scope)
(let ((self actor:*self*)
(environ:*env* (csys:environ scope)))
(environ:*env* (csys:environ scope))
(env (csys:environ scope)))
(environ:send-connect self '(:e01 "1-0") :op (csys:multiply -1))
;(environ:send-connect env :to self :target '(:csys :e01 "1-0")
; :op (csys:multiply -1))
;(environ:send-connect env :to self :target '(:csys :e01 "1-1"))
(environ:send-connect self '(:e01 "1-1"))
;; switch :active
nil)))
@ -86,10 +90,14 @@
(defun b2-next-one ()
(lambda (msg scope)
(let ((self actor:*self*)
(environ:*env* (csys:environ scope)))
(env (csys:environ scope))
(environ:*env* (csys:environ scope))
(zero '(:csys :c02 "0-0")))
(csys:send-create self :cat :s02 :loc "1-1" :connect :pred)
(csys:send-create self :cat :e02 :loc "2-1" :connect :succ)
(environ:send-connect self '(:c02 "0-0") :op (csys:multiply -1))
(environ:send-connect '(:c02 "0-0") self :op (csys:multiply -1))
;; switch :active
nil)))

31
test/test-csys.lisp
View file

@ -56,7 +56,7 @@
(tc:check-expected)
(t:show-result))))
(defun setup (cfg &key (delay 0.02))
(defun setup-test (cfg)
(setup-config)
(core:setup-services)
(destructuring-bind (prg &key (zero-cat :c00) (zero-val 0) eff-contacts) cfg
@ -64,33 +64,36 @@
(env (environ:create #'proc-env t:*test-suite* :eff-contacts eff-contacts)))
(setf (tc:receiver t:*test-suite*) rcvr)
(csys:create-zero prg env :categ (list :csys zero-cat) :value zero-val)
(sleep delay)
env)))
(defun teardown (&optional (delay 0.03))
(sleep delay)
(core:shutdown))
;;;; test definitions
(deftest test-basic-0 ()
(let ((environ:*env* (setup (list (basic:prog-b0)))))
(let ((environ:*env* (setup-test (list (basic:prog-b0)))))
;(rcvr (tc:receiver t:*test-suite*))
(sleep 0.02)
;(tc:expect rcvr (message:create '(:csys :effect :e01) :data '(:value 1)))
(environ:send-value '(:s00 "0-1") 1)
(environ:send-value '(:s00 "0-1") 2)
(teardown)))
(sleep 0.03)
(core:shutdown)))
(deftest test-basic-1 ()
(let ((environ:*env* (setup (basic:config-b1))))
(let ((environ:*env* (setup-test (basic:config-b1))))
(sleep 0.02)
(environ:send-value '(:s01 "0-0") 1)
(environ:send-value '(:s01 "0-1") 2)
(teardown)))
(sleep 0.03)
(core:shutdown)))
(deftest test-basic-2 ()
(let ((environ:*env* (setup (basic:config-b2))))
(environ:send-value '(:s02 "1-0") 1) (sleep 0.0001)
(environ:send-value '(:s02 "1-1") 2) (sleep 0.0001) ;; 2 => loop
(let ((environ:*env* (setup-test (basic:config-b2))))
(sleep 0.02)
(environ:send-value '(:s02 "1-0") 1)
(sleep 0.0001)
(environ:send-value '(:s02 "1-1") 2) ;; 2 => loop
(sleep 0.0001)
(environ:send-value '(:s02 "1-0") 2) ;; stop loop
(teardown)))
(sleep 0.03)
(core:shutdown)))