Skip to content

Commit

Permalink
Refactor/transfer mechanism/mutiple output states (#535)
Browse files Browse the repository at this point in the history
* -

* Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeuLink into CURRENT

# Conflicts:
#	tests/mechanisms/test_transfer_mechanism.py

* Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeuLink into CURRENT

# Conflicts:
#	tests/mechanisms/test_transfer_mechanism.py

* -

* -

* • State
  - docstring: STATE NAME ENTRY, MECHANISM/STATE and State constructor examples

* -

* • TransferMechanism
  - instantiate one OutputState for each item of variable

* -

* • TransferMechanism
  - _instantiate_output_states:  added to implement one standard OutputState for each InputState
• OutputState
  - fixed bug in assigning params to standard OutputStates

* • Mechanism subclasses
  - removed specification of output_states as list (replaced with string or tuple
    (to avoid mutable default assignment)
• TransferMechanism
  - __init__: assigned output_states to RESULT rather than [RESULT] to avoid default "gotcha"
  - _instantiate_output_states:  added to implement one standard OutputState for each InputState
• OutputState
  - fixed bug in assigning params to standard OutputStates

* • Mechanism subclasses
  - removed specification of output_states as list (replaced with string or tuple
    (to avoid mutable default assignment)
• TransferMechanism
  - __init__: assigned output_states to RESULT rather than [RESULT] to avoid default "gotcha"
  - _instantiate_output_states:  added to implement one standard OutputState for each InputState
• OutputState
  - fixed bug in assigning params to standard OutputStates

* • Mechanism subclasses
  - removed specification of output_states as list (replaced with string or tuple
    (to avoid mutable default assignment)
• TransferMechanism
  - __init__: assigned output_states to RESULT rather than [RESULT] to avoid default "gotcha"
  - _instantiate_output_states:  added to implement one standard OutputState for each InputState
• OutputState
  - fixed bug in assigning params to standard OutputStates
  • Loading branch information
jdcpni authored Nov 17, 2017
1 parent e3c46ba commit ac2c9f0
Show file tree
Hide file tree
Showing 55 changed files with 157 additions and 114 deletions.
2 changes: 1 addition & 1 deletion .idea/runConfigurations/AGT_Test_Script.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/DDM_Learning_Test.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/EVC_Gratton_Script___SEBASTIAN.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/FinalProject.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/Gating_Mechanism_Test_Script.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/GilzenratModel.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/Make_HTML.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/NEW_Learning_Markus.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/NetworkX_Examples.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/Profile_EVC_System_Test.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/Two_Layer_Test_Script.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/Xor_Script_1_process_working.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/Xor_Script_2_processes.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/_DDM_Test_Script.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/_DDM_scheduled_simple.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/_Documentation_Examples.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/_EVC_System_DEMO_Script.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/_META_TEST.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/_Mixed_NN___DDM_DEMO_Script.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/_Mixed_Neural_Network_and_DDM.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/_Scratch_Pad.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/_Stroop_Demo_Script.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/_Stroop_Model_Test.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/_System_Graph_and_Input_Test.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit ac2c9f0

Please sign in to comment.