-
Notifications
You must be signed in to change notification settings - Fork 30
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Refactor/ocm/state features all as input ports #2360
Merged
jdcpni
merged 410 commits into
devel
from
refactor/ocm/state_features_all_as_input_ports
Mar 27, 2022
Merged
Refactor/ocm/state features all as input ports #2360
jdcpni
merged 410 commits into
devel
from
refactor/ocm/state_features_all_as_input_ports
Mar 27, 2022
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
…ttps://github.com/PrincetonUniversity/PsyNeuLink into refactor/ocm/state_input_ports_PROBE_STATE_FEAT_FCT
fixes; now passes all show_graph tests
…ttps://github.com/PrincetonUniversity/PsyNeuLink into refactor/ocm/state_input_ports_PROBE_STATE_FEAT_FCT
_update_shadow_projections: raise error for attempt to shadow INTERNAL Node of nested comp
implemented test_shadow_nested_nodes that tests shadowing of nested nodes
…ttps://github.com/PrincetonUniversity/PsyNeuLink into refactor/ocm/state_input_ports_PROBE_STATE_FEAT_FCT � Conflicts: � tests/composition/test_show_graph.py
…Link into refactor/ocm/state_input_ports_PROBE_STATE_FEAT_FCT � Conflicts: � tests/composition/test_show_graph.py
…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 refactor/ocm/state_features_all_as_input_ports
…Link into refactor/ocm/state_features_all_as_input_ports
- fix bug in which state_feature_default = None was being ignored - fix bug in which deferred nodes were not being assigned state_feature_default
- fix bug in which state_feature_default = None was being ignored - fix bug in which deferred nodes were not being assigned state_feature_default
- test_deferred_init, test_partial_deferred_init(): added tests for controller.state_input_ports path_afferents
…Link into refactor/ocm/state_features_all_as_input_ports
- _parse_state_feature_specs: - fixed bug in handling of lists of numeric specs - renamed state_input_ports for numeric specs
- 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
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 fixes 1 alert when merging b45b8b9 into 138a291 - view on LGTM.com fixed 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.
• optimizationcontrolmechanism.py, test_control.py
moved to _update_state_input_port_names
• mechanism.py:
• registry.py: