Devel #700
Merged
Devel #700
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…Link into refactor/Projection/Context_devel # Conflicts: # psyneulink/components/mechanisms/adaptive/control/controlmechanism.py
…Link into devel # Conflicts: # Scripts/Examples/RL-DDM.py
… and 'devel' of https://github.com/PrincetonUniversity/PsyNeuLink into clean_up/function_and_system/backprop_and_show_graph # Conflicts: # psyneulink/components/functions/function.py
replace calcuate/CACULATE with assign/ASSIGN
replace calcuate/CACULATE with assign/ASSIGN
replace calcuate/CACULATE with assign/ASSIGN
added backward compatibility docstring: document replacement of calcuate/CACULATE with assign/ASSIGN
- implemented assign that takes assign_params_dict as arg
assign function now expects dict as argument - WORKING
…//github.com/PrincetonUniversity/PsyNeuLink into refactor/output_state/retire_assign_variable
docstring revs
…//github.com/PrincetonUniversity/PsyNeuLink into refactor/output_state/retire_assign_variable
docstring revs
docstring revs
Rumelhart Semantic Network: updated with step function
_instantiate_control_signals: debugged OWNER_VALUE assignment
…ends_before_terminal Fix/system/learning ends before terminal
…e/retire_assign_merge_devel Refactor/output state/retire assign merge devel
* • Scripts/Examples Rumelhart Semantic Network: updated with step function * • Scripts/Examples Rumelhart Semantic Network: updated with step function * - * • Examples Rumelhart Semantic Network script
* • Scripts/Examples
Rumelhart Semantic Network: updated with step function
* • Scripts/Examples
Rumelhart Semantic Network: updated with step function
* -
* • Examples
Rumelhart Semantic Network script
* • Examples
Rumelhart Semantic Network script:
eliminated explicit implementation of Step function;
now assigns Python-defined step function directly
… on addition of Pass to log)
…el because it generates an error
Fix/scripts/log changes
…ather than param base values), and are updated whenever mechanisms update their parameter states
…dict/parameter-state-values user_params and function_params now look at parameter state values (r…
* -
* -
* -
* -
* -
* -
* • DDM
__init__:
Modified implement DECISION_VARIABLE_ARRAY and SELECTED_INPUT_ARRAY
as StandardOutputStates
• OutputState
StandardOutputStates: added add_state_dicts method
• Scripts
RL-DDM: modified to used SELECTED_INPUT_ARRAY
* -
* -
* • DDM
docstring revs for DECISION_VARIABLE_ARRAY and SELECTED_INPUT_ARRAY
• Mechanism
_update_params_dicts: new method, called by _update_parameter_states
and _instantiate_output_states
- !!!HACK ALERT!!! had to put an exclude for noise (causes crash) --
this needs to be fixed
* -
* -
* -
* -
* -
* -
* -
* • DDM
__init__:
Modified implement DECISION_VARIABLE_ARRAY and SELECTED_INPUT_ARRAY
as StandardOutputStates
• OutputState
StandardOutputStates: added add_state_dicts method
• Scripts
RL-DDM: modified to used SELECTED_INPUT_ARRAY
* -
* -
* • DDM
docstring revs for DECISION_VARIABLE_ARRAY and SELECTED_INPUT_ARRAY
• Mechanism
_update_params_dicts: new method, called by _update_parameter_states
and _instantiate_output_states
- !!!HACK ALERT!!! had to put an exclude for noise (causes crash) --
this needs to be fixed
* -
* -
* • Mechanism
- _upate_params_dicts: restricted skipping of noise to INIT
• Tests
- test_parameter_states: reinstated tests for setting noise
* • LearningProjection
__init__: added error_function as an argument/attribute
• LearningAuxiliary
_instantiated_learning_components:
now uses error_function attribute of LearningProjection
(if specified) to assign the function to the ComparatorMechanism
* • LearningProjection
__init__: added error_function as an argument/attribute
• LearningAuxiliary
_instantiated_learning_components:
now uses error_function attribute of LearningProjection
(if specified) to assign the function to the ComparatorMechanism
docstring rev (to include error_function)
…ion/error_function • LearningProjection
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.