From c6dab9d2992c44d7be086a9572f72de45af659ad Mon Sep 17 00:00:00 2001
From: ocrampal <ocrampal@ocrampal.com>
Date: Thu, 28 May 2026 11:46:31 +0200
Subject: [PATCH] varie tests

---
 elements/neuron/presynapse.md              | 47 ++++++++++++----------
 modules/winnertakeall/winnertakeall-beh.md |  1 +
 modules/winnertakeall/winnertakeall.md     | 39 +++++++++++++-----
 3 files changed, 55 insertions(+), 32 deletions(-)

diff --git a/elements/neuron/presynapse.md b/elements/neuron/presynapse.md
index 4886705..abe596c 100644
--- a/elements/neuron/presynapse.md
+++ b/elements/neuron/presynapse.md
@@ -16,23 +16,31 @@ PRESYNAPSE
 
   type: comprehension
 
-  scope_intricated:
-    !DAY: SCOPE [&ORGANISM.!DAY]
-    !NIGHT: SCOPE [&ORGANISM.!NIGHT]
+  expansion:
 
-  context_intricated:
-    *AP: CONTEXT [&SOMA.*AP]
-
-  tub_intricated:
-    _NT: TUB [&ASTROSYNAPSE._NT] 
-    _ATP: TUB [&ASTROCYTE._ATP] 
-    _eCB: TUB [&POSTSYNAPSE._eCB]
-
-  expand_comprehension: 
-    _Vgcc_pre: TUB [ expand: VGCC_PRE, full: 10x, active: 5x, empty: 2x ]
+    _Vgcc_pre: TUB [ comp: VGCC_PRE, full: 10x, active: 5x, empty: 2x ]
     # il tub serve al tuning
 
-  instantiate_tub:
+  intrication:
+
+    # Scope
+    !DAY: SCOPE [ ref: &ORGANISM.!DAY]
+    !NIGHT: SCOPE [ ref: &ORGANISM.!NIGHT]
+
+    # Context  
+    *AP: CONTEXT [&SOMA.*AP]
+
+    # Tub
+    _NT: TUB [ ref: &ASTROSYNAPSE._NT] 
+    _ATP: TUB [ ref: &ASTROCYTE._ATP] 
+    _eCB: TUB [ ref: &POSTSYNAPSE._eCB]
+
+  instantiation:
+
+    # Context
+    *TunePossible: CONTEXT []
+
+    # Tub
     _Ca2+: TUB [ full: 60x, active: 30x, empty: 0x ]
     _Rrp: TUB [ full: 30x, active: 15x, empty: 0x ]
     _Rp: TUB [ full: 30x, active: 15x, empty: 0x ]
@@ -41,13 +49,10 @@ PRESYNAPSE
     _Ca2+FullDev: TUB [ full: 100x, active: _Ca2+.full, empty: 40x ]
     # serve al dev
 
-  istantiate_context:
-    *TunePossible: CONTEXT []
-
-  instantiate_behaviour:
-    @: MAIN_PRE []
-    @: TUNE_VGCC_PRE []
-    @: DEV-TUBS_PRE [] # da eliminare neuron-dev.md
+    # Behaviour
+    @: BEHAVIOUR [ beh: MAIN_PRE ]
+    @: BEHAVIOUR [ beh: TUNE_VGCC_PRE ]
+    @: BEHAVIOUR [ beh: DEV-TUBS_PRE ] # da eliminare neuron-dev.md
 ```
 
 ### MAIN_PRE
diff --git a/modules/winnertakeall/winnertakeall-beh.md b/modules/winnertakeall/winnertakeall-beh.md
index 564d198..f17fdea 100644
--- a/modules/winnertakeall/winnertakeall-beh.md
+++ b/modules/winnertakeall/winnertakeall-beh.md
@@ -14,6 +14,7 @@ EXCITATION
   activity_scope: !NIGHT
 
   tub_intricated: 
+    _Presynapse: TUB [in]
     _Presynapse: TUB [out.{}.{}.PRESYNAPSE]
     _Postsynapse: TUB [in.{}.{}.POSTSYNAPSE]
     # Qui il modulo interno TUB trova la PRESYNAPSE come istanziazione e la intrica con _Presynapse
diff --git a/modules/winnertakeall/winnertakeall.md b/modules/winnertakeall/winnertakeall.md
index e925b1c..31294e0 100644
--- a/modules/winnertakeall/winnertakeall.md
+++ b/modules/winnertakeall/winnertakeall.md
@@ -19,26 +19,43 @@ WINNERTAKEALL
     winnertakeall-beh.md
     ../../elements/neuron.md
 
-  expand_comprehension: 
-    @NEU-005: NEURON []
-    @NEU-006: NEURON []
+  expansion: 
+    @NEU-005: EXPAND [ comp: NEURON ]
+    @NEU-006: EXPAND [ comp: NEURON ]
 
-  instantiate_container:
+  instantiation:
 
-    # external intrication
+    # Scope
+    !NIGHT: SCOPE [ reference: &ORGANISM.!NIGHT]
 
-    @IN-EXCI-001: IN-EXCITATION [in: @NEU-001.@D-BRANCH-002, in: @NEU-002.@D-BRANCH-002]
-    @OUT-EXCI-001: OUT-EXCITATION [out: @NEU-001.@AXO-001, out: @NEU-002.@AXO-001]
-    @IN-INHI-001: IN-INHIBITION [in: @NEU-004.@SOMA, in: @NEU-003.@SOMA]
+    # Behaviour
+
+    ## external
+
+    @IN-EXCI-001: BEHAVIOUR [ beh: IN-EXCITATION, _InPossible: TUB [
+       post: @NEU-001.@D-BRANCH-002.&POSTSYNAPSE, 
+       post: @NEU-002.@D-BRANCH-002.&POSTSYNAPSE, 
+       ast: @NEU-001.@D-BRANCH-002.&ASTROSYNAPSE ] ]
+
+    @IN-EXCI-001: BEHAVIOUR [ beh: IN-EXCITATION, in: @NEU-001.@D-BRANCH-002, in: @NEU-002.@D-BRANCH-002 ]
+    @OUT-EXCI-001: BEHAVIOUR [ beh: OUT-EXCITATION, out: @NEU-001.@AXO-001, out: @NEU-002.@AXO-001]
+    @IN-INHI-001: BEHAVIOUR [ beh: IN-INHIBITION, in: @NEU-004.@SOMA, in: @NEU-003.@SOMA]
+
+    ## internal
+
+    ### Area xxx
+
+    @: BEHAVIOUR: [ beh: EXCITATION, _SynPossible: TUB [ 
+      pre: @NEU-001.@AXON-001.&PRESYNAPSE, 
+      post: @NEU-001.@D-BRANCH-001.&POSTSYNAPSE, 
+      ast: @NEU-001.@D-BRANCH-001.&ASTROSYNAPSE ] ]
 
-    # internal intrication
 
-    # Area xxx
     @: EXCITATION [out: @NEU-001.@AXON-001, in: @NEU-003.@D-BRANCH-001]
     @: EXCITATION [out: @NEU-001.@AXON-001, in: @NEU-004.@D-BRANCH-001, in: @NEU-003.@-BRANCH-001]
     @: INHIBITION [out: @NEU-002.@AXON-001, in: @NEU-003.@SOMA-001]
 
-    # Area yyy
+    ### Area yyy
     @: EXCITATION [out: @NEU-003.@AXON-001, in: @NEU-004.@D-BRANCH-003]
     @: EXCITATION [out: @NEU-004.@AXON-001, in: @NEU-002.@D-BRANCH-001]
 ```