diff --git a/organism/external.actuation.md b/organism/actuation.md similarity index 100% rename from organism/external.actuation.md rename to organism/actuation.md diff --git a/organism/internal-excitation.md b/organism/excitation.md similarity index 53% rename from organism/internal-excitation.md rename to organism/excitation.md index 3fc1061..6422da6 100644 --- a/organism/internal-excitation.md +++ b/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 - INTERNAL-EXCITATION.POSTYNASPE - INTERNAL-EXCITATION.ASTROSYNASPE + EXCITATION.PRESYNASPE + EXCITATION.POSTYNASPE + EXCITATION.ASTROSYNASPE tub_local: diff --git a/organism/external_sensory.md b/organism/inhibition.md similarity index 100% rename from organism/external_sensory.md rename to organism/inhibition.md diff --git a/organism/organism-beh.md b/organism/organism-beh.md index 50d61e6..7577ed6 100644 --- a/organism/organism-beh.md +++ b/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] ``` \ No newline at end of file diff --git a/organism/internal-inhibition.md b/organism/sensory.md similarity index 100% rename from organism/internal-inhibition.md rename to organism/sensory.md diff --git a/tectum/astro-reach.md b/tectum/astro-reach.md deleted file mode 100644 index 35c8c9c..0000000 --- a/tectum/astro-reach.md +++ /dev/null @@ -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 \ No newline at end of file diff --git a/tectum/internal-excitation.md b/tectum/excitation.md similarity index 80% rename from tectum/internal-excitation.md rename to tectum/excitation.md index 2a31562..05d08b4 100644 --- a/tectum/internal-excitation.md +++ b/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 - INTERNAL-EXCITATION.POSTYNASPE - INTERNAL-EXCITATION.ASTROSYNASPE + EXCITATION.PRESYNASPE + EXCITATION.POSTYNASPE + 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) - bind: [PRESYNAPSE, POSTSYNAPSE, ASTROSYNAPSE] - trace: None? + within_scope: ASTROCYTE + hypothesis: ( GoodTraces fullness ) AND NOT ( ASTROSYNAPSE full ) AND NOT ( PRESYNAPSE full ) AND NOT ( POSTSYNAPSE full) + bind: [PRESYNAPSE, POSTSYNAPSE, ASTROSYNAPSE] + trace: None? ``` ### ClearTraces: accumulator diff --git a/tectum/external-in-excitation.md b/tectum/external-in-excitation.md deleted file mode 100644 index f9ee409..0000000 --- a/tectum/external-in-excitation.md +++ /dev/null @@ -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 -``` \ No newline at end of file diff --git a/tectum/external-out-excitation.md b/tectum/external-out-excitation.md deleted file mode 100644 index 3c55e0f..0000000 --- a/tectum/external-out-excitation.md +++ /dev/null @@ -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 -``` \ No newline at end of file diff --git a/tectum/internal-inhibition.md b/tectum/inhibition.md similarity index 100% rename from tectum/internal-inhibition.md rename to tectum/inhibition.md diff --git a/tectum/tectum-beh.md b/tectum/tectum-beh.md index bf0c010..9866c03 100644 --- a/tectum/tectum-beh.md +++ b/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: - # 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] + intrications: - @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] - - 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] + @INHIBITION-012: INHIBITION [out: @WTA-002.@OUT-INHIBITION-001, in: @WTA-003.@IN-INHIBITION-004] ``` \ No newline at end of file diff --git a/winnertakeall/internal-excitation.md b/winnertakeall/excitation.md similarity index 85% rename from winnertakeall/internal-excitation.md rename to winnertakeall/excitation.md index 7a325e7..b9369ab 100644 --- a/winnertakeall/internal-excitation.md +++ b/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 - INTERNAL-EXCITATION.POSTYNASPE - INTERNAL-EXCITATION.ASTROSYNASPE + EXCITATION.PRESYNASPE + EXCITATION.POSTYNASPE + 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 diff --git a/winnertakeall/external-in-inhibition.md b/winnertakeall/external-in-inhibition.md deleted file mode 100644 index e69de29..0000000 diff --git a/winnertakeall/external-out-inhibition.md b/winnertakeall/external-out-inhibition.md deleted file mode 100644 index e69de29..0000000 diff --git a/winnertakeall/external-in-excitation.md b/winnertakeall/in-excitation.md similarity index 81% rename from winnertakeall/external-in-excitation.md rename to winnertakeall/in-excitation.md index 1cfd2db..a7a21d6 100644 --- a/winnertakeall/external-in-excitation.md +++ b/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 diff --git a/tectum/external-in-inhibition.md b/winnertakeall/in-inhibition.md similarity index 100% rename from tectum/external-in-inhibition.md rename to winnertakeall/in-inhibition.md diff --git a/winnertakeall/inhibition.md b/winnertakeall/inhibition.md new file mode 100644 index 0000000..e166561 --- /dev/null +++ b/winnertakeall/inhibition.md @@ -0,0 +1,12 @@ +# inhibition.md + +## INHIBITION: Container + +**Inhibitory Behavior**: + +```Gen +INHIBITION + + type: container + +``` diff --git a/winnertakeall/internal-inhibition.md b/winnertakeall/internal-inhibition.md deleted file mode 100644 index e3aac76..0000000 --- a/winnertakeall/internal-inhibition.md +++ /dev/null @@ -1,12 +0,0 @@ -# internal-inhibition.md - -## INTERNAL-INHIBITION: Container - -**Inhibitory Behavior**: - -```Gen -INTERNAL-INHIBITION - - type: container - -``` diff --git a/winnertakeall/external-out-excitation.md b/winnertakeall/out-excitation.md similarity index 100% rename from winnertakeall/external-out-excitation.md rename to winnertakeall/out-excitation.md diff --git a/tectum/external-out-inhibition.md b/winnertakeall/out-inhibition.md similarity index 100% rename from tectum/external-out-inhibition.md rename to winnertakeall/out-inhibition.md diff --git a/winnertakeall/winnertakeall-beh.md b/winnertakeall/winnertakeall-beh.md index f504847..b1f27c6 100644 --- a/winnertakeall/winnertakeall-beh.md +++ b/winnertakeall/winnertakeall-beh.md @@ -22,18 +22,19 @@ WINNERTAKEALL-BEH @NEU-005: NEURON @NEU-006: NEURON - external_intrication: - @EXTERNAL-IN-EXCITATION-001: EXTERNAL-IN-EXCITATION [in: @NEU-001.@DENDRITIC-BRANCH-002, in: @NEU-002.@DENDRITIC-BRANCH-002] - @EXTERNAL-OUT-EXCITATION-001: EXTERNAL-OUT-EXCITATION [out: @NEU-001.@AXO-001, out: @NEU-002.@AXO-001] + intrications: + # external intrication + @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] - @INTERNAL-EXCITATION-012: INTERNAL-EXCITATION [out: @NEU-001.@AXON-001, in: @NEU-0032.@DENDRITIC-BRANCH-001, in: @NEU-003.@DENDRITIC-BRANCH-001] - @INTERNAL-INHIBITION-012: INTERNAL-INHIBITION [out: @NEU-002.@AXON-01, in: @NEU-003.@SOMA-001] + @EXCITATION-010: EXCITATION [out: @NEU-001.@AXON-001, in: @NEU-003.@D-BRANCH-001] + @EXCITATION-012: EXCITATION [out: @NEU-001.@AXON-001, in: @NEU-004.@D-BRANCH-001, in: @NEU-003.@-BRANCH-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] - @INTERNAL-EXCITATION-022: [out: @NEU-004.@AXON-001, in: @NEU-002.@DENDRITIC-BRANCH-001] + @EXCITATION-020: EXCITATION [out: @NEU-003.@AXON-001, in: @NEU-004.@D-BRANCH-003] + @EXCITATION-022: EXCITATION [out: @NEU-004.@AXON-001, in: @NEU-002.@D-BRANCH-001] ```