nuovo tentativo di espansione esplicita con tuning

organism/excitation.md

@@ -2,22 +2,22 @@
 include_toc: true
 ---
 
-# internal-excitation.md
+# excitation.md
 
-## INTERNAL-EXCITATION: Container
+## EXCITATION: Container
 
 **Exhitatory Behavior**: 
 
 ```Gen
 
-INTERNAL-EXCITATION
+EXCITATION
 
   type: container
 
   tub_intricated: 
     PRESYNAPSE: out.{}.{}.PRESYNAPSE
     POSTSYNAPSE: in.{}.{}.POSTSYNAPSE
-    ASTROSYNAPSE: in.{}.{}.ASTROCYTE.ASTROSYNAPSE
+    ASTROSYNAPSE: in.{}.{}.ASTROSYNAPSE
 ```
 
 #### TUN-PRE-POST-ASTRO-SYNAPSE: Tuner
@@ -25,12 +25,12 @@ INTERNAL-EXCITATION
 ```Gen
 TUN-PRE-POST-ASTRO-SYNAPSE
   type: tuner
-  contained_by: INTERNAL-EXCITATION
+  contained_by: EXCITATION
 
   tunes: 
-    INTERNAL-EXCITATION.PRESYNASPE
+    EXCITATION.PRESYNASPE
-    INTERNAL-EXCITATION.POSTYNASPE
+    EXCITATION.POSTYNASPE
-    INTERNAL-EXCITATION.ASTROSYNASPE
+    EXCITATION.ASTROSYNASPE
 
   tub_local:
 

organism/organism-beh.md

@@ -22,6 +22,6 @@ ORGANSIM-BEH
     internal_intrication:
       # Area xxx
 
-      @INTERNAL-EXCITATION-010: INTERNAL-EXCITATION [out: @TECTUM.@EXTERNAL-OUT-EXCITATION-001, in: @VERTEBREA.@EXTERNAL-IN-EXCITATION-002]
+      @EXCITATION-010: EXCITATION [out: @TECTUM.@WTA-001.@OUT-EXCITATION-001, in: @VERTEBREA.@WTA-001.@IN-EXCITATION-002]
 
 ```

tectum/astro-reach.md

@@ -1,19 +0,0 @@
----
-include_toc: true
----
-
-# astro-reach.md
-
-## ASTRO-REACH: Container
-
-```Gen
-
-ASTRO-REACH
-
-  type: container
-
-  tub_intricated:
-    POSTSYNAPSE: reach. ???
-    ASTROSYNAPSE: ast.{}.ASTROSYNAPSE
-
-    #qui creiamo la possibilita' di associare TUTTE le POSTSYNAPSE del WTA agli ASTROSYNAPSE

tectum/excitation.md

@@ -2,13 +2,13 @@
 include_toc: true
 ---
 
-# internal-excitation.md
+# excitation.md
 
-## INTERNAL-EXCITATION: Container
+## EXCITATION: Container
 
 ```Gen
 
-INTERNAL-EXCITATION
+EXCITATION
 
   type: container
 
@@ -17,8 +17,6 @@ INTERNAL-EXCITATION
     POSTSYNAPSE: in.{}.{}.POSTSYNAPSE
     ASTROSYNAPSE: in.{}.ASTROCYTE.ASTROSYNAPSE
 #    ASTROSYNAPSE: in.{}.{}.ASTROSYNAPSE # E' equivalente
-
-
 ```
 
 #### TUN-PRE-POST-ASTRO-SYNAPSE: Tuner
@@ -26,12 +24,12 @@ INTERNAL-EXCITATION
 ```Gen
 TUN-PRE-POST-ASTRO-SYNAPSE
   type: tuner
-  contained_by: INTERNAL-EXCITATION
+  contained_by: EXCITATION
 
   tunes: 
-    INTERNAL-EXCITATION.PRESYNASPE
+    EXCITATION.PRESYNASPE
-    INTERNAL-EXCITATION.POSTYNASPE
+    EXCITATION.POSTYNASPE
-    INTERNAL-EXCITATION.ASTROSYNASPE
+    EXCITATION.ASTROSYNASPE
 
   tub_local:
 
@@ -67,9 +65,10 @@ ActivateAstroPostPre: ( active: 6x )
   contained_by: TUN-PRE-POST-ASTRO-SYNAPSE
 
   in_context: ActivateAstroPostPre_ctx
-    hypothesis: ( GoodTraces fullness ) AND NOT ( ASTROSYNAPSE full ) AND NOT ( PRESYNAPSE full ) AND NOT ( POSTSYNAPSE full)
+    within_scope: ASTROCYTE
-      bind: [PRESYNAPSE, POSTSYNAPSE, ASTROSYNAPSE]
+      hypothesis: ( GoodTraces fullness ) AND NOT ( ASTROSYNAPSE full ) AND NOT ( PRESYNAPSE full ) AND NOT ( POSTSYNAPSE full)
-      trace: None?
+        bind: [PRESYNAPSE, POSTSYNAPSE, ASTROSYNAPSE]
+        trace: None?
 ```
 
 ### ClearTraces: accumulator

tectum/external-in-excitation.md

@@ -1,17 +0,0 @@
-# external-in-excitation.md
-
-## EXTERNAL-IN-EXCITATION: Container
-
-**external-in-excitation**:
-Qui mettiamo assieme tutte le PRESYNAPSE di una possibile relazione con un altro modulo  
-
-```Gen
-
-EXTERNAL-IN-EXCITATION
-
-  type: container
-
-  tub_intricated: 
-    POSTSYNAPSE: in.{}.{}.POSTSYNAPSE
-    ASTROSYNAPSE: in.{}.ASTROCYTE.ASTROSYNAPSE
-```

tectum/external-out-excitation.md

@@ -1,16 +0,0 @@
-# external-out-excitation.md
-
-## EXTERNAL-OUT-EXCITATION: Container
-
-**external-out-excitation**:
-Qui mettiamo assieme tutte le POSTSYNAPSE di una possibile relazione con un altro modulo  
-
-```Gen
-
-EXTERNAL-OUT-EXCITATION
-
-  type: container
-
-  tub_intricated: 
-    PRESYNAPSE: out.{}.{}.PRESYNAPSE
-```

tectum/tectum-beh.md

@@ -22,21 +22,12 @@ TECTUM-BEH
       @AST-001: ASTROCYTE
       @AST-002: ASTROCYTE
 
-      @ASTRO-REACH-001: ASTRO-REACH [reach: @WTA-001, ast: @AST-001]
+    bind: [@WTA-001, @AST-001]
       
-    external_intrication:
+    intrications:
-      # questi sono messi a disposizione dell'organismo che mette assieme organi come tectum, hypothalamus
-
-      @EXTERNAL-IN-EXCITATION-001: EXTERNAL-IN-EXCITATION [in: @WTA-001.@EXTERNAL-IN-EXCITATION-003, in: @WTA-002.@EXTERNAL-IN-EXCITATION-003]
       
-      @EXTERNAL-OUT-EXCITATION-001: EXTERNAL-OUT-EXCITATION [out: @WTA-001.@EXTERNAL-OUT-EXCITATION-003, out: @WTA-002.@EXTERNAL-OUT-EXCITATION-003]
+      @EXCITATION-010: EXCITATION [out: @WTA-001.@OUT-EXCITATION-001, in: @WTA-003.@IN-EXCITATION-002]
 
-
+      @INHIBITION-012: INHIBITION [out: @WTA-002.@OUT-INHIBITION-001, in: @WTA-003.@IN-INHIBITION-004]
-    internal_intrication:
-      # Area xxx
-
-      @INTERNAL-EXCITATION-010: INTERNAL-EXCITATION [out: @WTA-001.@EXTERNAL-OUT-EXCITATION-001, in: @WTA-003.@EXTERNAL-IN-EXCITATION-002]
-
-      @INTERNAL-INHIBITION-012: INTERNAL-INHIBITION [out: @WTA-002.@EXTERNAL-OUT-INHIBITION-001, in: @WTA-003.@EXTERNAL-IN-INHIBITION-004]
 
 ```

winnertakeall/excitation.md

@@ -2,14 +2,14 @@
 include_toc: true
 ---
 
-# internal-excitation.md
+# excitation.md
 
-Questo deve essere un container, perche' viene espanso da WINNERTAKEALL e contiene le PRESYNAPSE e POSTSYNAPSE E ASTROSYSNAPSE che possibilmente possiamo collegare. Poi non facciamo il Tun di INTERNAL-EXCITATION, ma di PRESYNAPSE, POSTSYNAPSE e ASTROSYNAPSE, con il bind. 
+Questo deve essere un container, perche' viene espanso da WINNERTAKEALL e contiene le PRESYNAPSE e POSTSYNAPSE E ASTROSYSNAPSE che possibilmente possiamo collegare. Poi non facciamo il Tun di EXCITATION, ma di PRESYNAPSE, POSTSYNAPSE e ASTROSYNAPSE, con il bind. 
 
-## INTERNAL-EXCITATION: Container
+## EXCITATION: Container
 
 ```Gen
-INTERNAL-EXCITATION
+EXCITATION
 
   type: container
 
@@ -24,12 +24,12 @@ INTERNAL-EXCITATION
 ```Gen
 TUN-PRE-POST-ASTRO-SYNAPSE
   type: tuner
-  contained_by: INTERNAL-EXCITATION
+  contained_by: EXCITATION
 
   tunes: 
-    INTERNAL-EXCITATION.PRESYNASPE
+    EXCITATION.PRESYNASPE
-    INTERNAL-EXCITATION.POSTYNASPE
+    EXCITATION.POSTYNASPE
-    INTERNAL-EXCITATION.ASTROSYNASPE
+    EXCITATION.ASTROSYNASPE
 
   tub_local:
 
@@ -76,7 +76,7 @@ ActivateAstroPostPre: ( active: 6x )
 ```Gen
 ClearTraces: ( active: 6x ) # stesso RF del bind
   type: accumulator
-  contained_by: TUN-PRE-POST-ASTRO
+  contained_by: TUN-PRE-POST-ASTRO-SYNAPSE
 
   in_context: ActivateAstroPostPre_ctx
     hypothesis: GoodTraces NOT empty
@@ -92,7 +92,7 @@ Qui deattiviamo la Syn
 DeActivateSynPostPre: ( active: 6x )
 
   type: binder
-  contained_by: TUN-PRE-POST-ASTRO
+  contained_by: TUN-PRE-POST-ASTRO-SYNAPSE
 
   # Devo essere sicuro di eliminare i 3 che sono collegati, non a caso.
   in_context: DeActivateSynPostPre_ctx

winnertakeall/in-excitation.md

@@ -1,13 +1,13 @@
-# external-in-excitation.md
+# in-excitation.md
 
-## EXTERNAL-IN-EXCITATION: Container
+## IN-EXCITATION: Container
 
 **external-in-excitation**:
 Qui mettiamo assieme tutte le PRESYNAPSE di una possibile relazione con un altro modulo  
 
 ```Gen
 
-EXTERNAL-IN-EXCITATION
+IN-EXCITATION
 
   type: container
 

winnertakeall/inhibition.md

@@ -0,0 +1,12 @@
+# inhibition.md
+
+## INHIBITION: Container
+
+**Inhibitory Behavior**:
+
+```Gen
+INHIBITION
+
+  type: container
+
+```

winnertakeall/internal-inhibition.md

@@ -1,12 +0,0 @@
-# internal-inhibition.md
-
-## INTERNAL-INHIBITION: Container
-
-**Inhibitory Behavior**:
-
-```Gen
-INTERNAL-INHIBITION
-
-  type: container
-
-```

winnertakeall/winnertakeall-beh.md

@@ -22,18 +22,19 @@ WINNERTAKEALL-BEH
       @NEU-005: NEURON
       @NEU-006: NEURON
 
-    external_intrication:
+    intrications:
-      @EXTERNAL-IN-EXCITATION-001: EXTERNAL-IN-EXCITATION [in: @NEU-001.@DENDRITIC-BRANCH-002, in: @NEU-002.@DENDRITIC-BRANCH-002]
+      # external intrication
-      @EXTERNAL-OUT-EXCITATION-001: EXTERNAL-OUT-EXCITATION [out: @NEU-001.@AXO-001, out: @NEU-002.@AXO-001]
+      @IN-EXCITATION-001: IN-EXCITATION [in: @NEU-001.@D-BRANCH-002, in: @NEU-002.@D-BRANCH-002]
+      @OUT-EXCITATION-001: OUT-EXCITATION [out: @NEU-001.@AXO-001, out: @NEU-002.@AXO-001]
 
-    internal_intrication:
+      # internal intrication
       # Area xxx
-      @INTERNAL-EXCITATION-010: INTERNAL-EXCITATION [out: @NEU-001.@AXON-001, in: @NEU-003.@DENDRITIC-BRANCH-001]
+      @EXCITATION-010: EXCITATION [out: @NEU-001.@AXON-001, in: @NEU-003.@D-BRANCH-001]
-      @INTERNAL-EXCITATION-012: INTERNAL-EXCITATION [out: @NEU-001.@AXON-001, in: @NEU-0032.@DENDRITIC-BRANCH-001, in: @NEU-003.@DENDRITIC-BRANCH-001]
+      @EXCITATION-012: EXCITATION [out: @NEU-001.@AXON-001, in: @NEU-004.@D-BRANCH-001, in: @NEU-003.@-BRANCH-001]
-      @INTERNAL-INHIBITION-012: INTERNAL-INHIBITION [out: @NEU-002.@AXON-01, in: @NEU-003.@SOMA-001]
+      @INHIBITION-012: INHIBITION [out: @NEU-002.@AXON-01, in: @NEU-003.@SOMA-001]
 
       # Area yyy
-      @INTERNAL-EXCITATION-020: INTERNAL-EXCITATION [out: @NEU-003.@AXON-001, in: @NEU-004.@DENDRITIC-BRANCH-003]
+      @EXCITATION-020: EXCITATION [out: @NEU-003.@AXON-001, in: @NEU-004.@D-BRANCH-003]
-      @INTERNAL-EXCITATION-022: [out: @NEU-004.@AXON-001, in: @NEU-002.@DENDRITIC-BRANCH-001]
+      @EXCITATION-022: EXCITATION [out: @NEU-004.@AXON-001, in: @NEU-002.@D-BRANCH-001]
 
 ```