Refactor/output state/retire assign merge devel #687
Merged
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
…ue_based_version_input_state' of https://github.com/PrincetonUniversity/PsyNeuLink into feat/DDM/value_based_version_input_state # Conflicts: # psyneulink/components/states/state.py
…ue_based_version_input_state' of https://github.com/PrincetonUniversity/PsyNeuLink into feat/DDM/value_based_version_input_state # Conflicts: # psyneulink/components/states/state.py
…//github.com/PrincetonUniversity/PsyNeuLink into refactor/output_state/retire_assign_variable
This reverts commit 0f8a301
This reverts commit 0f8a301
This reverts commit 0f8a301
…able attribute.
• Mechanism
- added _params_dict property that contains entries for all attributes allowed to be
referenced by variable of OutputState
[this may be inefficient as a way of accessing attribute values during execution]
- _handle_arg_input_states(): refactoed to accomodate changes to OutputState (see below)
• OutputState
- refactored to allow variable to be specified in terms of any (allowable) attributes
of its owner Mechanism, including:
variable property: overrides super, and returns _parse_output_state_variable
_parse_output_state_variable
_parse_output_state_function
- deprecated ASSIGN and INDEX:
these now are assigned to function and (OWNER_VALUE, <INDEX>) respectively
(current version is fully backwardly compatible with ASSIGN, INDEX and CALCULATE)
• ControlSignal
commented out variable property definition
• Function
- UserDefinedFunction: fixed bug in which assignment of functions
that do not recognize params or context args crashed
• Component
- refactored variable-related methods to accomodate changes to OutputState
- fixed bugs that failed to recognize assignment of methods as function attribute
…//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
_instantiate_control_signals: debugged OWNER_VALUE assignment
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.
Refactoring of OutputState to support flexible assignment of its variable attribute.
• Mechanism
- added _params_dict property that contains entries for all attributes allowed to be
referenced by variable of OutputState
[this may be inefficient as a way of accessing attribute values during execution]
- _handle_arg_input_states(): refactoed to accomodate changes to OutputState (see below)
• OutputState
- refactored to allow variable to be specified in terms of any (allowable) attributes
of its owner Mechanism, including:
variable property: overrides super, and returns _parse_output_state_variable
_parse_output_state_variable
_parse_output_state_function
- deprecated ASSIGN and INDEX:
these now are assigned to function and (OWNER_VALUE, ) respectively
(current version is fully backwardly compatible with ASSIGN, INDEX and CALCULATE)
• ControlSignal
commented out variable property definition
• Function
- UserDefinedFunction: fixed bug in which assignment of functions
that do not recognize params or context args crashed
• Component
- refactored variable-related methods to accomodate changes to OutputState
- fixed bugs that failed to recognize assignment of methods as function attribute