Test/compositon/ validate input dict keys #2365
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/ocm/state_input_ports
…Link into devel � Conflicts: � psyneulink/core/components/mechanisms/modulatory/control/optimizationcontrolmechanism.py
- add allow_probes and exclude_probes_from_output
- docstring mods re: allow_probes • optimizationcontrolmechanism.py: - allow_probes: eliminate DIRECT setting - remove _parse_monitor_for_control_input_ports (no longer needed without allow_probes=DIRECT)
- change "exclude_probes_from_output" -> "include_probes_in_output"
- docstring mods re: allow_probes and include_probes_in_output
- docstring mods re: allow_probes and include_probes_in_output
- add allow_probes handling (moved from OCM) • optimizationcontrolmechanism.py: - move allow_probes to controlmechanism.py • composition.py: - refactor handling of allow_probes to permit for any ControlMechanism • objectivemechanism.py: - add modulatory_mechanism attribute
- add allow_probes handling (moved from OCM) • optimizationcontrolmechanism.py: - move allow_probes to controlmechanism.py • composition.py: - refactor handling of allow_probes to permit for any ControlMechanism - add _handle_allow_probes_for_control() to reconcile setting on Composition and ControlMechanism • objectivemechanism.py: - add modulatory_mechanism attribute
add assignment of learning_mechanism to objective_mechanism.modulatory_mechanism for add_learning methods
…Link into feat/composition/probes
- add test_unnested_PROBE
- add test_nested_PROBES
TBD: test include_probes_in_output
- add_node(): support tuple with required_role
- _determine_node_roles:
fix bug in which nested comp was prevented from being an OUTPUT Node if,
in addition to Nodes that qualifed as OUTPUT, it also had nodes that projected
to Nodes in an outer comp (making it look like it was INTERNAL)
…nUniversity/PsyNeuLink into feat/composition/probes � Conflicts: � tests/composition/test_composition.py
- add_node(): enforce include_probes_in_output = True for nested Compositions
- execute():
- replace return of output_value with get_output_value()
- rename_instance_in_registry(): finish implementing (including **new_name** arg) • optimizationcontrolmechanism.py: - _update_state_features_dict: rename deferred state_input_ports
- rename_instance_in_registry(): finish implementing (including **new_name** arg) • optimizationcontrolmechanism.py: - _update_state_features_dict: rename deferred state_input_ports
- standarize prefixes for state_input_ports
- standarize prefixes for state_input_ports
- _show_structure(): fix parameterport label bug
…Link into refactor/ocm/state_features_all_as_input_ports
_validate_input_keys(): add method to validate keys of inputs to run() method
…Link into refactor/ocm/state_features_all_as_input_ports � Conflicts: � psyneulink/core/compositions/composition.py
- test_inputs_key_errors()
- test_inputs_key_errors(): add test for running nested composition with inputs
- execute(): allow direct call to nested composition with inputs
…Link into test/compositon/_validate_input_dict_keys
…Link into test/compositon/_validate_input_dict_keys
|
This PR causes the following changes to the html docs (ubuntu-latest-3.7-x64): See CI logs for the full diff. |
1 similar comment
|
This PR causes the following changes to the html docs (ubuntu-latest-3.7-x64): See CI logs for the full diff. |
…Link into test/compositon/_validate_input_dict_keys
|
This PR causes the following changes to the html docs (ubuntu-latest-3.7-x64): See CI logs for the full diff. |
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.
• composition.py:
(see commented out sections marked MODIFIED 3/28/22 for alternative using context.source)
• test_composition.py: