From 9392c8c12d0c622c3e5e99e0532b3516ee242d0c Mon Sep 17 00:00:00 2001 From: Helmut Merz Date: Mon, 25 May 2026 16:11:11 +0200 Subject: [PATCH] csys: remove unneeded code, minor clean-up, set sleep after init to 30ms --- lib/csys/csys.ex | 2 +- lib/csys/environ.ex | 11 ++++------- test/csys_test.exs | 8 +++----- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/lib/csys/csys.ex b/lib/csys/csys.ex index dda9070..13c1398 100644 --- a/lib/csys/csys.ex +++ b/lib/csys/csys.ex @@ -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 diff --git a/lib/csys/environ.ex b/lib/csys/environ.ex index 77b8931..5caf495 100644 --- a/lib/csys/environ.ex +++ b/lib/csys/environ.ex @@ -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 diff --git a/test/csys_test.exs b/test/csys_test.exs index 84ae696..f0d3567 100644 --- a/test/csys_test.exs +++ b/test/csys_test.exs @@ -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)}"