csys: remove unneeded code, minor clean-up, set sleep after init to 30ms
This commit is contained in:
parent
45086fc424
commit
9392c8c12d
3 changed files with 8 additions and 13 deletions
|
|
@ -58,7 +58,7 @@ defmodule Scopes.CSys do
|
|||
# send shortcuts
|
||||
|
||||
def send_message(rcvr, head, data \\ %{}) do
|
||||
Logger.info([rcvr: inspect(rcvr), head: inspect(head), data: inspect(data)])
|
||||
Logger.info rcvr: inspect(rcvr), head: inspect(head), data: inspect(data)
|
||||
Actor.send(rcvr, Shape.create(head, data: data))
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ defmodule Scopes.CSys.Environ do
|
|||
alias Scopes.Shape
|
||||
|
||||
defmodule State do
|
||||
defstruct [neurons: [], cells: %{}, init_seq: []]
|
||||
defstruct [cells: %{}, init_seq: []]
|
||||
end
|
||||
|
||||
def setup({state, proc}, seq \\ []) do
|
||||
|
|
@ -18,9 +18,7 @@ defmodule Scopes.CSys.Environ do
|
|||
def proc_env(msg, scope = {state, _proc, _syns, env}) do
|
||||
case Shape.head(msg) do
|
||||
{:exec, func} -> func.(state)
|
||||
[:csys, :created | _rest] ->
|
||||
process_creation(msg, scope)
|
||||
#send(env, msg)
|
||||
[:csys, :created | _rest] -> process_creation(msg, scope)
|
||||
_ -> send(env, msg) # forward message to application
|
||||
end
|
||||
end
|
||||
|
|
@ -36,12 +34,11 @@ defmodule Scopes.CSys.Environ do
|
|||
else
|
||||
state.cells
|
||||
end
|
||||
neurons = [new | state.neurons]
|
||||
{step, seq} = List.pop_at(state.init_seq, 0)
|
||||
state1 = %State{neurons: neurons, cells: cells, init_seq: seq}
|
||||
state1 = %State{cells: cells, init_seq: seq}
|
||||
CSys.update({state1, proc, syns, env})
|
||||
if step do
|
||||
Process.sleep(1)
|
||||
#Process.sleep(1)
|
||||
step.(state1)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
defmodule Scopes.CSysTest do
|
||||
use ExUnit.Case, async: true
|
||||
use ExUnit.Case, async: false
|
||||
@moduletag timeout: 5000
|
||||
|
||||
#alias Scopes.CSys
|
||||
|
|
@ -19,8 +19,7 @@ defmodule Scopes.CSysTest do
|
|||
describe "basic-program:" do
|
||||
test "minimal-b1" do
|
||||
env = Environ.setup(Program.prepare_basic(), Program.init_seq_b1())
|
||||
#receive_data(~w(csys created)a)
|
||||
Process.sleep(10)
|
||||
Process.sleep(30)
|
||||
Environ.forward_value(env, [:csys, :c00, {0, 0}], 0)
|
||||
assert 0 = receive_data().value
|
||||
Environ.forward_value(env, [:csys, :s01, {1, 0}], 1)
|
||||
|
|
@ -34,8 +33,7 @@ defmodule Scopes.CSysTest do
|
|||
|
||||
test "recursive-1" do
|
||||
env = Environ.setup(Program.prepare_basic(), Program.init_recursive_1())
|
||||
#receive_data(~w(csys created)a)
|
||||
Process.sleep(10)
|
||||
Process.sleep(30)
|
||||
Environ.forward_value(env, [:csys, :c00, {0, 0}], 42)
|
||||
assert receive_data().value == 42
|
||||
refute_received msg, "unhandled message(s): #{inspect(msg)}"
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue