Refactor/ocm/state features all as input ports #2351
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
…thub.com/PrincetonUniversity/PsyNeuLink into refactor/ocm/state_input_ports_PROBE_FIX
retore append of control_signals in _instantiate_control_projections()
restore append of control_signals in _instantiate_control_projections() • test_composition.py: add test_partially_overlapping_local_and_control_mech_control_specs_in_unnested_and_nested_comp
…unnested_and_nested_comp(): - added clear_registry() to allow names to be reused in both runs of test
docstring: added projections entry to list of attributes - add_controller: added call to _add_node_aux_components() for controller
_add_node_aux_components(): added deletion of item from aux_components if instantiated
- comment out _add_node_aux_components() (causing new failures)
- move _instantiate_control_projections to be with _instantiate_control_projections,
after self.add_node(self.controller.objective_mechanism (to be more orderly)
…rtially_overlapping... (with addition of _add_aux_components in add_controller commented out)
…y one test:
- test_agent_rep_assignement_as_controller_and_replacement
- add_controller: few more minor mods; still passes all tests
- __init__: resrict specification to only one of control, modulatory_signals, or control_signals (synonyms)
…ections for ocm.state_input_ports
- _get_original_senders(): added support for nested composition
needs to be checked for more than one level
needs to be refactored to be recursive
- _update_state_input_ports_for_controller: fix invalid_state_features to allow input_CIM of nested comp in agent_rep
- _get_original_senders: made recursive
- add figure for shadowing
…Link into refactor/ocm/state_features_all_as_input_ports � Conflicts: � psyneulink/core/components/mechanisms/modulatory/control/optimizationcontrolmechanism.py � psyneulink/core/components/ports/parameterport.py � psyneulink/core/compositions/composition.py
- __init__(): modify typecheck for input_ports to allow single items
…Link into refactor/ocm/state_features_all_as_input_ports � Conflicts: � psyneulink/core/components/ports/inputport.py
…Link into refactor/ocm/state_features_all_as_input_ports
- allow single spec (None, array, tuple, or Components) that is assigned to all INPUT Node InputPorts
- state_feature_default is assigned to all unspecified INPUT Node InputPorts
(for a list that is shorter than the number, a dict or a set that has fewer,
or any that are added to agent_rep after controller is initially constructed and added to Composition)
|
This PR causes the following changes to the html docs (ubuntu-latest-3.7-x64): See CI logs for the full diff. |
|
This pull request introduces 1 alert when merging c5a01e3 into 404030e - view on LGTM.com new alerts:
|
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.
• processingmechanism.py:
• optimizationcontrolmechanism.py
that is assigned to all INPUT Node InputPorts on agent_rep at time of OCM construction
(i.e., for those not specified in a list, set or dict that has fewer entries
than the number of INPUT Nodes on agent_rep when OCM is initially constructed or
or any that are added to agent_rep afterwards)