diff --git a/modules/winnertakeall/winnertakeall.md b/modules/winnertakeall/winnertakeall.md index 5251a4f..950ab4a 100644 --- a/modules/winnertakeall/winnertakeall.md +++ b/modules/winnertakeall/winnertakeall.md @@ -22,8 +22,8 @@ WINNERTAKEALL expansion: - @NEU_005: EXPAND [ comp: NEURON ] - @NEU_006: EXPAND [ comp: NEURON ] + @NEU_005: EXPAND [ comprehension: NEURON ] + @NEU_006: EXPAND [ comprehension: NEURON ] instantiation: diff --git a/organism.md b/organism.md index 80b10fb..a06c23a 100644 --- a/organism.md +++ b/organism.md @@ -15,9 +15,9 @@ ORGANISM organs/vertebrae/vertebrae.md expansion: - @TECTUM: EXPANSION [ expansion: TECTUM ] - @VERTEBRAE: EXPANSION [ expansion: VERTEBRAE ] - @HYPOTHALAMUS: EXPANSION [ expansion: HYPOTHALAMUS ] + @TECTUM: EXPANSION [ comprehension: TECTUM ] + @VERTEBRAE: EXPANSION [ comprehension: VERTEBRAE ] + @HYPOTHALAMUS: EXPANSION [ comprehension: HYPOTHALAMUS ] instantiation: # scope @@ -27,7 +27,6 @@ ORGANISM # Context - # tubs # behaviour diff --git a/organs/tectum/tectum.md b/organs/tectum/tectum.md index 5f0df2f..95587e7 100644 --- a/organs/tectum/tectum.md +++ b/organs/tectum/tectum.md @@ -1,6 +1,6 @@ # tectum.md -## TECTUM: comprehension +## TECTUM Qui comprendiamo il collegamento fra moduli tipo winnertakeall che mettono a disposizione delle interfacce che devono essere collegate fra moduli. I neuroni sono gia' dichiarati nei moduli, quello che manca sono gli ASTROCYTE. Consideriamo che gli ASTROCYTE sono interni ad un organo. @@ -13,34 +13,42 @@ TECTUM ../../modules/winnertakeall.md ../../elements/astrocyte.md - expand_comprehension: + expansion: - # Modules - @WTA-001: WINNERTAKEALL [] - @WTA-002: WINNERTAKEALL [] + @WTA-001 EXPANSION [ comprehension: WINNERTAKEALL ] + @WTA-002 EXPANSION [ comprehension: WINNERTAKEALL ] - # Astrocytes - @AST-001: ASTROCYTE [] - @AST-002: ASTROCYTE [] + @AST-001 EXPANSION [ comprehension: ASTROCYTE ] + @AST-002 EXPANSION [ comprehension: ASTROCYTE ] - @: bind [@WTA-001, @AST-001] + @ BIND [ comprehension: @WTA-001, comprehension: @AST-001 ] - istantiate_container: + istantiation: # Qui l'interprete deve controllare che due o piu' "in" non sono ammessi, perche' potrebbero riguardare ASTROCYTE diversi. Da capore come fare il controllo. - # external intrication + # external @: OUT-EXCITATION [out: @WTA-001.@OUT-EXCI-001] @: IN-EXCITATION [in: @WTA-003.@OUT-EXCI-001] - # interanl intrication + @IN-EXCI-001: BEHAVIOUR [ behaviour: IN_EXCITATION, __GroupPossible: GROUP [ + post: @NEU_001.@D_BRANCH_002._postsynapse, + post: @NEU_002.@D_BRANCH_002._postsynapse, + astro: @NEU_001.@D_BRANCH_002._astrosynapse ] ] + + # internal @: EXCITATION [out: @WTA-001.@OUT-EXCI-001, in: @WTA-003.@IN-EXCI-002] @: INHIBITION [out: @WTA-002.@OUT-INHI-001, in: @WTA-003.@IN-INHI-004] + + @: BEHAVIOUR [ behaviour: EXCITATION, __GroupPossible: GROUP [ + pre: @NEU_001.@AXON-001._presynapse, + post: @NEU_001.@D_BRANCH_001._postsynapse, + astro: @NEU_001.@D_BRANCH_001._astrosynapse ] ] ``` -## EXCITATION: Container +## EXCITATION ```Gen