Feat/mechanism/input target lable dicts #752
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 devel # Conflicts: # Scripts/Examples/RL-DDM.py # Scripts/Examples/Reinforcement-Learning.py
added _parse_input_labels() and _parse_target_labels() methods run(): modified to use _parse_input_labels and _parse_target_labels
added _parse_input_labels() and _parse_target_labels() methods run(): modified to use _parse_input_labels and _parse_target_labels
added _parse_input_labels() and _parse_target_labels() methods run(): modified to use _parse_input_labels and _parse_target_labels
added input_labels and output_labels propoerties added _get_state_value_labels() method
https://github.com/PrincetonUniversity/PsyNeuLink into feat/mechanism/input_target_lable_dicts
https://github.com/PrincetonUniversity/PsyNeuLink into feat/mechanism/input_target_lable_dicts
…Link into devel # Conflicts: # Scripts/Markus Stroop.py
_parse_input_labels(): added error messages
_parse_input_labels(): added error messages
Run: removed _parse_target_labels (they are just the input_labels
for a TARGET Mechanism
• Mechanism
docstring revs for INPUT_LABELS_DICDT and OUTPUT_LABELS_DICT
https://github.com/PrincetonUniversity/PsyNeuLink into feat/mechanism/input_target_lable_dicts
kmantel
added a commit
that referenced
this pull request
Apr 13, 2018
* devel: LearningAuxilliary: rename to LearningAuxiliary (correct double l typo) scheduling: decouple Scheduler and Condition, allow multiple execution_ids utilites: get method to prune unused args from a function from composition branch Feat/mechanism/input target lable dicts (#752) testing: Resolve leftover merge conflicts, fixes #747 testing: correct pytest setup ovewrite, losing some settings Feat/mechanism/input target label dicts (#751) Scheduling: fix bug where termination conditions persisted across calls to run tests,function/LinearCombination: Add tests with absent parameters test,function/LinearCombination: Rename second test function to prevent overwriting results • Context (#746) Refactor/context/deprecate init status (#745) Refactor/context/structured (#744) Fix/function/stability (#743) • IntegratorMechanism (#742)
jdcpni
added a commit
that referenced
this pull request
Apr 13, 2018
* • IntegratorMechanism (#742) - added input_states and output_states to init and assign_args_to_params_dicts • LinearMatrix - keyword: fixed bug in which assignment of rows or cols could not handle scalars * Fix/function/stability (#743) * • IntegratorMechanism - added input_states and output_states to init and assign_args_to_params_dicts • LinearMatrix - keyword: fixed bug in which assignment of rows or cols could not handle scalars * • Function Stability: - function: add PROB_INDICATOR option that assigns a value of 1 to the probabilistically chosen option - _validate_params: moved call to super() to end to allow matrix param to be evaluated before continuing validation * Refactor/context/structured (#744) * - * - * - * - * - * - * - * - * - * - * - * - * - * - * • Log LogCondition - subset of ContextFlags used to specified logPref • Context ContextFlags - implemented as common set of context flags for: - initialization - execution tracking - logging ContextStatus - aliases to ContextFlags (for backward compatibility) * • Log LogCondition - subset of ContextFlags used to specified logPref • Context ContextFlags - implemented as common set of context flags for: - initialization - execution tracking - logging ContextStatus - aliases to ContextFlags (for backward compatibility) * • Log LogCondition - subset of ContextFlags used to specified logPref • Context ContextFlags - implemented as common set of context flags for: - initialization - execution tracking - logging ContextStatus - aliases to ContextFlags (for backward compatibility) * - * - * - * - * - * • Context context.status replaced with specific field assignments (.initialization_phase, .execution_phase, and .source) * • Context context.status replaced with specific field assignments (.initialization_phase, .execution_phase, and .source) * • Context context.status replaced with specific field assignments (.initialization_phase, .execution_phase, and .source) * - * - * • Context context.status replaced with specific field assignments (.initialization_phase, .execution_phase, and .source) * - * - * - * - * - * • Context context.status replaced with specific field assignments (.initialization_phase, .execution_phase, and .source) * Refactor/context/deprecate init status (#745) * - * - * - * - * - * - * - * - * - * - * - * - * - * - * • Log LogCondition - subset of ContextFlags used to specified logPref • Context ContextFlags - implemented as common set of context flags for: - initialization - execution tracking - logging ContextStatus - aliases to ContextFlags (for backward compatibility) * • Log LogCondition - subset of ContextFlags used to specified logPref • Context ContextFlags - implemented as common set of context flags for: - initialization - execution tracking - logging ContextStatus - aliases to ContextFlags (for backward compatibility) * • Log LogCondition - subset of ContextFlags used to specified logPref • Context ContextFlags - implemented as common set of context flags for: - initialization - execution tracking - logging ContextStatus - aliases to ContextFlags (for backward compatibility) * - * - * - * - * - * • Context context.status replaced with specific field assignments (.initialization_phase, .execution_phase, and .source) * • Context context.status replaced with specific field assignments (.initialization_phase, .execution_phase, and .source) * • Context context.status replaced with specific field assignments (.initialization_phase, .execution_phase, and .source) * - * - * • Context context.status replaced with specific field assignments (.initialization_phase, .execution_phase, and .source) * - * - * - * - * - * - * Merge branches 'devel' and 'refactor/context/structured' of https://github.com/PrincetonUniversity/PsyNeuLink into refactor/context/structured # Conflicts: # .idea/runConfigurations/Tests.xml # Scripts/McClure.py * Merge branches 'devel' and 'refactor/context/structured' of https://github.com/PrincetonUniversity/PsyNeuLink into refactor/context/structured # Conflicts: # .idea/runConfigurations/Tests.xml # Scripts/McClure.py * - * - * • Context - consolidated init_status into context.initialization_status * • Context - consolidated init_status into context.initialization_status * • Context - consolidated init_status into context.initialization_status * • Context (#746) - initialization_status.UNSET -> initialization_status.INITALIZING where appropriate - delete InitStatus class * test,function/LinearCombination: Rename second test function to prevent overwriting results Test names should indicate tested feature. Fixes: daebb62 ("Linear combination fix (#734)") Cherry-picked from devel-llvm: fdc686e * tests,function/LinearCombination: Add tests with absent parameters Cherry-picked from devel-llvm: 1dcca60 * Scheduling: fix bug where termination conditions persisted across calls to run * Feat/mechanism/input target label dicts (#751) * - * - * - * - * • Environment added _parse_input_labels() and _parse_target_labels() methods run(): modified to use _parse_input_labels and _parse_target_labels * • Environment added _parse_input_labels() and _parse_target_labels() methods run(): modified to use _parse_input_labels and _parse_target_labels * • Environment added _parse_input_labels() and _parse_target_labels() methods run(): modified to use _parse_input_labels and _parse_target_labels * - * - * - * - * - * • Mechanism added input_labels and output_labels propoerties added _get_state_value_labels() method * • Merged with devel * testing: correct pytest setup ovewrite, losing some settings * testing: Resolve leftover merge conflicts, fixes #747 * Feat/mechanism/input target lable dicts (#752) * - * - * - * - * • Environment added _parse_input_labels() and _parse_target_labels() methods run(): modified to use _parse_input_labels and _parse_target_labels * • Environment added _parse_input_labels() and _parse_target_labels() methods run(): modified to use _parse_input_labels and _parse_target_labels * • Environment added _parse_input_labels() and _parse_target_labels() methods run(): modified to use _parse_input_labels and _parse_target_labels * - * - * - * - * - * - * • Mechanism added input_labels and output_labels propoerties added _get_state_value_labels() method * • Merged with devel * • Environment _parse_input_labels(): added error messages * • Environment _parse_input_labels(): added error messages * • Environment Run: removed _parse_target_labels (they are just the input_labels for a TARGET Mechanism • Mechanism docstring revs for INPUT_LABELS_DICDT and OUTPUT_LABELS_DICT * • Environment Run: removed _parse_target_labels (they are just the input_labels for a TARGET Mechanism • Mechanism docstring revs for INPUT_LABELS_DICDT and OUTPUT_LABELS_DICT * - * - * - * - * - * • Component - _execute: added **kwargs argument, passed to call to function to accomodate LearningMechanism that uses this • AutoassociativeLearningMechanism - _execute calls super(LearningMechanism, self) to skip Learning • LearningMechanism: _ execute calls super()._execute with **kwargs * • Component - _execute: added **kwargs argument, passed to call to function to accomodate LearningMechanism that uses this • AutoassociativeLearningMechanism - _execute calls super(LearningMechanism, self) to skip Learning • LearningMechanism: _ execute calls super()._execute with **kwargs • PrecictionMechanism: _execute calls super()._execute * • Component - _execute: added **kwargs argument, passed to call to function to accomodate LearningMechanism and EVCControlMechanism, the functions for which expect additional arguments • AutoassociativeLearningMechanism - _execute calls super(LearningMechanism, self) to skip Learning • LearningMechanism: _ execute calls super()._execute with **kwargs • PrecictionMechanism: _execute calls super()._execute * • Component - _execute: added **kwargs argument, passed to call to function to accomodate LearningMechanism and EVCControlMechanism, the functions for which expect additional arguments • AutoassociativeLearningMechanism - _execute calls super(LearningMechanism, self) to skip Learning • LearningMechanism: _ execute calls super()._execute with **kwargs • PrecictionMechanism: _execute calls super()._execute
kmantel
added a commit
that referenced
this pull request
May 1, 2018
* devel: Feat/projections/masked mapping projection (#775) adding exceptions to get_current_function_param and get_current_mechanism_param - not intended for looking up 'variable' Feat/projections/masked mapping projection (#771) • LCA (#770) • LCA (#769) Refactor/mechanism/transfermechanism (#768) Fix default_variable bug (#767) Feat/inputstate/combine (#766) Refactor/context/source (#765) Defaults: ensure that function attr appears when examining Defaults Rewrite Function instantiation: Component: create fewer instances during init when function arg is a class LinearMatrix: make keyword method static to reflect how it is used refactor/rename _variable_not_specified to be more generic, using enum Defaults: add enum to denote flexibility of assignments Component: add class method to get new param class defaults Defaults: add ClassDefaults.function to several classes, and use it as fallback utilities: add function to detect if obj is an instance or a subclass of a class Component: override __deepcopy__ method to use shared items parsing: add method to parse function variable from variable imports: pycharm-optimize to avoid unnecessary circularities Params: copy dict/ROODs nested in params arguments to avoid side effects Refactor/context/set and test (#762) fixing bug in looking up target values for learning which caused first target value to be repeated LinearCombination, Reduce: handle negative exponents during init (avoid zero division) Functions: simplify noise validation adding a note to the ddm plot() documentation to clarify that the plot does not correspond to the actual results of the mechanism fixing drift diffusion integrator bug - returned threshold even when it crossed the negative threshold Fix/misc/misc (#759) PredictionErrorMechanism: correct infinite recursion in _execute Docs/context/context (#757) • Mechanism (#756) Refactor/mechanisms/ execute (#754) LearningAuxilliary: rename to LearningAuxiliary (correct double l typo) scheduling: decouple Scheduler and Condition, allow multiple execution_ids utilites: get method to prune unused args from a function from composition branch Feat/mechanism/input target lable dicts (#752) testing: Resolve leftover merge conflicts, fixes #747 testing: correct pytest setup ovewrite, losing some settings Feat/mechanism/input target label dicts (#751) Scheduling: fix bug where termination conditions persisted across calls to run tests,function/LinearCombination: Add tests with absent parameters test,function/LinearCombination: Rename second test function to prevent overwriting results • Context (#746) Refactor/context/deprecate init status (#745) Refactor/context/structured (#744) Fix/function/stability (#743) • IntegratorMechanism (#742)
kmantel
added a commit
that referenced
this pull request
May 1, 2018
* devel: Feat/projections/masked mapping projection (#775) adding exceptions to get_current_function_param and get_current_mechanism_param - not intended for looking up 'variable' Feat/projections/masked mapping projection (#771) • LCA (#770) • LCA (#769) Refactor/mechanism/transfermechanism (#768) Fix default_variable bug (#767) Feat/inputstate/combine (#766) Refactor/context/source (#765) Defaults: ensure that function attr appears when examining Defaults Rewrite Function instantiation: Component: create fewer instances during init when function arg is a class LinearMatrix: make keyword method static to reflect how it is used refactor/rename _variable_not_specified to be more generic, using enum Defaults: add enum to denote flexibility of assignments Component: add class method to get new param class defaults Defaults: add ClassDefaults.function to several classes, and use it as fallback utilities: add function to detect if obj is an instance or a subclass of a class Component: override __deepcopy__ method to use shared items parsing: add method to parse function variable from variable imports: pycharm-optimize to avoid unnecessary circularities Params: copy dict/ROODs nested in params arguments to avoid side effects Refactor/context/set and test (#762) fixing bug in looking up target values for learning which caused first target value to be repeated LinearCombination, Reduce: handle negative exponents during init (avoid zero division) Functions: simplify noise validation adding a note to the ddm plot() documentation to clarify that the plot does not correspond to the actual results of the mechanism fixing drift diffusion integrator bug - returned threshold even when it crossed the negative threshold Fix/misc/misc (#759) PredictionErrorMechanism: correct infinite recursion in _execute Docs/context/context (#757) • Mechanism (#756) Refactor/mechanisms/ execute (#754) LearningAuxilliary: rename to LearningAuxiliary (correct double l typo) scheduling: decouple Scheduler and Condition, allow multiple execution_ids utilites: get method to prune unused args from a function from composition branch Feat/mechanism/input target lable dicts (#752) testing: Resolve leftover merge conflicts, fixes #747 testing: correct pytest setup ovewrite, losing some settings Feat/mechanism/input target label dicts (#751) Scheduling: fix bug where termination conditions persisted across calls to run tests,function/LinearCombination: Add tests with absent parameters test,function/LinearCombination: Rename second test function to prevent overwriting results • Context (#746) Refactor/context/deprecate init status (#745) Refactor/context/structured (#744) Fix/function/stability (#743) • IntegratorMechanism (#742)
Merged
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.
• Environment
Run: removed _parse_target_labels (they are just the input_labels
for a TARGET Mechanism
• Mechanism
docstring revs for INPUT_LABELS_DICDT and OUTPUT_LABELS_DICT