Skip to content

Commit

Permalink
Refactor/state/doc test bugs (#551)
Browse files Browse the repository at this point in the history
* mechanism docs and state docs

* making progress toward all tests passing

* triaging broken doc tests

* created homepage test file

* documentation tests

* • Mechanism, InputState
  _parse_arg_input_states, _parse_state_specific_specs: fixed bug in handling of tuple specs

* • Mechanism, InputState
  _parse_arg_input_states, _parse_state_specific_specs: fixed bug in handling of tuple specs

* • Mechanism, InputState
  _parse_arg_input_states, _parse_state_specific_specs:
      fixed bug in handling of tuple specs
      adding passing of default_variable and size to _parse_state_specs

* • Mechanism, InputState
  _parse_arg_input_states, _parse_state_specific_specs:
      fixed bug in handling of tuple specs
      adding passing of default_variable and size to _parse_state_specs

* -

* -

* -

* -

* • State
  _parse_state_specs: added support for (State name, Mechanism) tuple inside other tuples
• DDM:
  __init__: fixed bug with declaration of standard_output_states

* -

* -

* -

* • ModulatorySignal
  _is_modulatory_spec:  added

* -

* -

* -

* • ModulatorySignal
  _is_modulatory_spec:  added

* -

* -

* -

* -

* -

* • Component
  - _assign_args_to_param_dicts: fixed failure to assign deafults to paramClassDefaults

* • Component
  - _assign_args_to_param_dicts: fixed failure to assign deafults to paramClassDefaults

* • Component
  - _assign_args_to_param_dicts: fixed failure to assign deafults to paramClassDefaults
  - _instantiate_defaults: assign default param values for single-item modulatory specs

* • Component
  - _assign_args_to_param_dicts: fixed failure to assign deafults to paramClassDefaults
  - _instantiate_defaults: assign default param values for single-item modulatory specs

* -

* -

* Merge branch 'feat/Function/TDLearning' of https://github.com/PrincetonUniversity/PsyNeuLink into feat/Function/TDLearning

# Conflicts:
#	.idea/runConfigurations/_Mixed_Neural_Network_and_DDM.xml
#	.idea/runConfigurations/_Multilayer_Learning_Test_Script.xml
#	.idea/runConfigurations/_Reinforcement_Learning_Test_Script.xml
#	.idea/runConfigurations/_Stroop_Model_Learning_Test_Script.xml
#	.idea/runConfigurations/_Stroop_Model_Test.xml

* Merge branch 'feat/Function/TDLearning' of https://github.com/PrincetonUniversity/PsyNeuLink into feat/Function/TDLearning

# Conflicts:
#	.idea/runConfigurations/_Mixed_Neural_Network_and_DDM.xml
#	.idea/runConfigurations/_Multilayer_Learning_Test_Script.xml
#	.idea/runConfigurations/_Reinforcement_Learning_Test_Script.xml
#	.idea/runConfigurations/_Stroop_Model_Learning_Test_Script.xml
#	.idea/runConfigurations/_Stroop_Model_Test.xml

* Merge branch 'feat/Function/TDLearning' of https://github.com/PrincetonUniversity/PsyNeuLink into feat/Function/TDLearning

# Conflicts:
#	.idea/runConfigurations/_Mixed_Neural_Network_and_DDM.xml
#	.idea/runConfigurations/_Multilayer_Learning_Test_Script.xml
#	.idea/runConfigurations/_Reinforcement_Learning_Test_Script.xml
#	.idea/runConfigurations/_Stroop_Model_Learning_Test_Script.xml
#	.idea/runConfigurations/_Stroop_Model_Test.xml

* Merge branch 'feat/Function/TDLearning' of https://github.com/PrincetonUniversity/PsyNeuLink into feat/Function/TDLearning

# Conflicts:
#	.idea/runConfigurations/_Mixed_Neural_Network_and_DDM.xml
#	.idea/runConfigurations/_Multilayer_Learning_Test_Script.xml
#	.idea/runConfigurations/_Reinforcement_Learning_Test_Script.xml
#	.idea/runConfigurations/_Stroop_Model_Learning_Test_Script.xml
#	.idea/runConfigurations/_Stroop_Model_Test.xml

* Merge branch 'feat/Function/TDLearning' of https://github.com/PrincetonUniversity/PsyNeuLink into feat/Function/TDLearning

# Conflicts:
#	.idea/runConfigurations/_Mixed_Neural_Network_and_DDM.xml
#	.idea/runConfigurations/_Multilayer_Learning_Test_Script.xml
#	.idea/runConfigurations/_Reinforcement_Learning_Test_Script.xml
#	.idea/runConfigurations/_Stroop_Model_Learning_Test_Script.xml
#	.idea/runConfigurations/_Stroop_Model_Test.xml

* Merge branch 'feat/Function/TDLearning' of https://github.com/PrincetonUniversity/PsyNeuLink into feat/Function/TDLearning

# Conflicts:
#	.idea/runConfigurations/_Mixed_Neural_Network_and_DDM.xml
#	.idea/runConfigurations/_Multilayer_Learning_Test_Script.xml
#	.idea/runConfigurations/_Reinforcement_Learning_Test_Script.xml
#	.idea/runConfigurations/_Stroop_Model_Learning_Test_Script.xml
#	.idea/runConfigurations/_Stroop_Model_Test.xml

* Merge branch 'feat/Function/TDLearning' of https://github.com/PrincetonUniversity/PsyNeuLink into feat/Function/TDLearning

# Conflicts:
#	.idea/runConfigurations/_Mixed_Neural_Network_and_DDM.xml
#	.idea/runConfigurations/_Multilayer_Learning_Test_Script.xml
#	.idea/runConfigurations/_Reinforcement_Learning_Test_Script.xml
#	.idea/runConfigurations/_Stroop_Model_Learning_Test_Script.xml
#	.idea/runConfigurations/_Stroop_Model_Test.xml

* -

* -

* -

* -

* -

* -

* -

* -

* Merge branch 'feat/Function/TDLearning' of https://github.com/PrincetonUniversity/PsyNeuLink into feat/Function/TDLearning

# Conflicts:
#	.idea/runConfigurations/_Mixed_Neural_Network_and_DDM.xml
#	.idea/runConfigurations/_Multilayer_Learning_Test_Script.xml
#	.idea/runConfigurations/_Reinforcement_Learning_Test_Script.xml
#	.idea/runConfigurations/_Stroop_Model_Learning_Test_Script.xml
#	.idea/runConfigurations/_Stroop_Model_Test.xml

* Merge branch 'feat/Function/TDLearning' of https://github.com/PrincetonUniversity/PsyNeuLink into feat/Function/TDLearning

# Conflicts:
#	.idea/runConfigurations/_Mixed_Neural_Network_and_DDM.xml
#	.idea/runConfigurations/_Multilayer_Learning_Test_Script.xml
#	.idea/runConfigurations/_Reinforcement_Learning_Test_Script.xml
#	.idea/runConfigurations/_Stroop_Model_Learning_Test_Script.xml
#	.idea/runConfigurations/_Stroop_Model_Test.xml
  • Loading branch information
jdcpni authored Nov 28, 2017
1 parent 18ca369 commit 4c6811c
Show file tree
Hide file tree
Showing 87 changed files with 1,804 additions and 625 deletions.
5 changes: 3 additions & 2 deletions .idea/inspectionProfiles/Project_Default.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/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.

Loading

0 comments on commit 4c6811c

Please sign in to comment.