csys: add detectors registry to environment, for efferent (motoric) neurons
This commit is contained in:
parent
8e66cd63ed
commit
c6292309a4
2 changed files with 27 additions and 15 deletions
|
|
@ -10,7 +10,7 @@
|
||||||
(:shape :scopes/shape)
|
(:shape :scopes/shape)
|
||||||
(:util :scopes/util)
|
(:util :scopes/util)
|
||||||
(:alx :alexandria))
|
(:alx :alexandria))
|
||||||
(:export #:environment #:*environment*
|
(:export #:environment #:*environment* #:detectors
|
||||||
#:init
|
#:init
|
||||||
#:send #:send-message
|
#:send #:send-message
|
||||||
#:neuron #:synapse
|
#:neuron #:synapse
|
||||||
|
|
@ -23,16 +23,20 @@
|
||||||
(defclass environment ()
|
(defclass environment ()
|
||||||
((actions :reader actions :initarg :actions :initform (make-hash-table))
|
((actions :reader actions :initarg :actions :initform (make-hash-table))
|
||||||
(sensors :reader sensors :initarg :sensors
|
(sensors :reader sensors :initarg :sensors
|
||||||
|
:initform (make-hash-table :test #'equal))
|
||||||
|
(detectors :reader detectors :initarg :detectors
|
||||||
:initform (make-hash-table :test #'equal))))
|
:initform (make-hash-table :test #'equal))))
|
||||||
|
|
||||||
(defvar *environment* (make-instance 'environment))
|
(defvar *environment* (make-instance 'environment))
|
||||||
|
|
||||||
;;;; sensors: automatically created actors (neuron), addressable via message head
|
(defun init (&optional probe)
|
||||||
|
|
||||||
(defun init (probe)
|
|
||||||
(setf (gethash :sensor (actions *environment*)) #'create-sensor)
|
(setf (gethash :sensor (actions *environment*)) #'create-sensor)
|
||||||
(let ((zero (actor:create (neuron #'std-proc 0 (list (synapse probe))))))
|
(let* ((default-det (or probe (actor:create (neuron #'do-log))))
|
||||||
(setf (gethash '(:init :zero) (sensors *environment*)) (list zero))))
|
(zero (make-neuron default-det :state 0)))
|
||||||
|
(setf (gethash '(:init :zero) (sensors *environment*)) (list zero))
|
||||||
|
(setf (gethash :default (detectors *environment*)) (list default-det))))
|
||||||
|
|
||||||
|
;;;; sensors: neurons receiving messages from environment, addressable via message head
|
||||||
|
|
||||||
(defun send-message (head data &key customer)
|
(defun send-message (head data &key customer)
|
||||||
(send (message:create head :data data :customer customer)))
|
(send (message:create head :data data :customer customer)))
|
||||||
|
|
@ -49,6 +53,15 @@
|
||||||
;(util:lgi key sns)
|
;(util:lgi key sns)
|
||||||
sns))
|
sns))
|
||||||
|
|
||||||
|
;;;; detectors: pseudo-neurons in environment, addressabel via message head
|
||||||
|
|
||||||
|
(defun do-log (msg state syns env)
|
||||||
|
(util:lgi msg))
|
||||||
|
|
||||||
|
(defun find-detectors (key &optional (default-key :default) (env *environment*))
|
||||||
|
(let ((dts (detectors env)))
|
||||||
|
(gethash key dts (gethash default-key dts))))
|
||||||
|
|
||||||
;;;; 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*))
|
||||||
|
|
|
||||||
|
|
@ -31,8 +31,6 @@
|
||||||
(let ((nst (in-seq val state :remove t)))
|
(let ((nst (in-seq val state :remove t)))
|
||||||
(csys:update-neuron #'probe nst syns env)))))
|
(csys:update-neuron #'probe nst syns env)))))
|
||||||
|
|
||||||
(defvar *probe* nil)
|
|
||||||
|
|
||||||
(defun add (msg state syns env)
|
(defun add (msg state syns env)
|
||||||
(list msg (+ (shape:data msg) state) syns env))
|
(list msg (+ (shape:data msg) state) syns env))
|
||||||
|
|
||||||
|
|
@ -42,20 +40,21 @@
|
||||||
(async:init)
|
(async:init)
|
||||||
(let* ((t:*test-suite* (make-instance 't:test-suite :name "csys"))
|
(let* ((t:*test-suite* (make-instance 't:test-suite :name "csys"))
|
||||||
(csys:*environment* (make-instance 'test-env :test-suite t:*test-suite*))
|
(csys:*environment* (make-instance 'test-env :test-suite t:*test-suite*))
|
||||||
(*probe* (actor:create
|
(probe (actor:create
|
||||||
(csys:neuron #'probe '(1 3 4 5)
|
(csys:neuron #'probe '(1 3 4 5)
|
||||||
nil csys:*environment*))))
|
nil csys:*environment*))))
|
||||||
(load (t:test-path "config-csys" "etc"))
|
(load (t:test-path "config-csys" "etc"))
|
||||||
(core:setup-services)
|
(core:setup-services)
|
||||||
(unwind-protect
|
(unwind-protect
|
||||||
(progn
|
(progn
|
||||||
(test-init))
|
(test-init probe))
|
||||||
(sleep 0.1)
|
(sleep 0.1)
|
||||||
(async:finish)
|
(async:finish)
|
||||||
(t:show-result))))
|
(t:show-result))))
|
||||||
|
|
||||||
(deftest test-init ()
|
(deftest test-init (probe)
|
||||||
(csys:init *probe*)
|
;(setf (gethash '(:std :d0) (csys:detectors csys:*environment*)) probe)
|
||||||
|
(csys:init probe)
|
||||||
(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