Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Docs/output state/clean up #714

Merged
merged 6 commits into from
Mar 9, 2018
Merged

Docs/output state/clean up #714

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9133f82
• ControlMechanism
jdcpni Mar 8, 2018
85bb281
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Mar 8, 2018
e35a870
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Mar 9, 2018
975c6fa
-
jdcpni Mar 9, 2018
ea2ee79
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Mar 9, 2018
defada8
• OutputState
jdcpni Mar 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions psyneulink/components/states/outputstate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
.. _OutputState_Specification_by_Variable:

* **variable** -- creates an OutputState using the specification as the OutputState's `variable
<OutputState.variable>` (see `OutputState_Customization`). This must be compatible with (have the same number
<OutputState.variable>` (see `OutputState_Customization`). This must be compatible with (have the same number
and type of elements as) the OutputState's `function <OutputState.function>`. A default name is assigned based
on the name of the Mechanism (see `Naming`).
..
Expand All @@ -177,15 +177,15 @@

* *VARIABLE*:<keyword or list> - specifies the attribute(s) of its `owner <OutputState.owner>` Mechanism to use
as the input to the OutputState's `function <OutputState.function>` (see `OutputState_Customization`); this
must be compatible with (in the number and format of the items it specifies) with the OutputState's
`function <OutputState.function>`.
must be compatible (in the number and format of the items it specifies) with the OutputState's `function
<OutputState.function>`.
|
* *FUNCTION*:<`Function <Function>`, function or method> - specifies the function used to transform and/or
combine the item(s) specified for the OutputState's `variable <OutputState.variable>` into its
`value <OutputState.value>`; its input must be compatible (in the number and format of elements) with the
specification of the OutputState's `variable <OutputState.variable>` (see `OutputState_Customization`).
|
* *PROJECTIONS* or *MECHANISMS*:<list of `Projections <Projection> and/or `Mechanisms <Mechanism>`> - specifies
* *PROJECTIONS* or *MECHANISMS*:<list of `Projections <Projection>` and/or `Mechanisms <Mechanism>`> - specifies
one or more efferent `MappingProjections <MappingProjection>` from the OutputState, Mechanims that should
receive them, and/or `ModulatoryProjections <ModulatoryProjection>` for it to receive; this may be constrained
by or have consequences for the OutputState's `variable <InputState.variable>` and/or its `value
Expand Down Expand Up @@ -383,8 +383,8 @@

An OutputState's `value <OutputState.value>` can be customized by specifying its `variable <OutputState.variable>`
and/or `function <OutputState.function>` in the **variable** and **function** arguments of the OutputState's
constructor, respectively, the corresponding entries (*VARIABLE* and *FUNCTION*) of an `OutputState specification
dictionary <OutputState_Specification_Dictionary>`, or in the variable spec item of a `3-item tuple
constructor, the corresponding entries (*VARIABLE* and *FUNCTION*) of an `OutputState specification
dictionary <OutputState_Specification_Dictionary>`, or in the variable spec (2nd) item of a `3-item tuple
<OutputState_Tuple_Specification>` for the OutputState.

*OutputState* `variable <OutputState.variable>`
Expand Down