-
Notifications
You must be signed in to change notification settings - Fork 31
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
Docs/cim figure #2252
Merged
Merged
Docs/cim figure #2252
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
…ut_ports # Conflicts: # psyneulink/core/components/mechanisms/modulatory/control/optimizationcontrolmechanism.py
- __init__: moved controller instantiation until after nodes, projections and pathways
- __init__: restored add_controller position
…teger Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
…ut_ports # Conflicts: # psyneulink/core/llvm/builder_context.py
…Link into refactor/ocm/state_input_ports
- _update_controller: added - add_controller and _analyze_graph(): call _update_controller
_update_controller: fixed to loop through all input_ports of comp INPUT nodes
- test_agent_rep_assignement_as_controller_and_replacement: updated to test that shadowing projections to state_input_ports are properly added and deleted
…Link into refactor/ocm/state_input_ports � Conflicts: � tests/composition/test_control.py
- _function: refactored to put use aggregation_function at end - _grid_evaluate: still needs to return all_samples
…rincetonUniversity/PsyNeuLink into refactor/ocm/state_input_ports � Conflicts: � psyneulink/core/components/mechanisms/modulatory/control/optimizationcontrolmechanism.py
- added call to _update_controller to add_node - moved test for projections to controller.state_input_ports to run()
…Link into refactor/ocm/state_input_ports
moved calls to _update_controller to _complete_init_of_partially_initialized_nodes moved _update_controller to ocm._update_state_input_ports • optimizationcontrolmechanism.py: added _update_state_input_ports [**still needed work**]
moved calls to _update_controller to _complete_init_of_partially_initialized_nodes moved _update_controller to ocm._update_state_input_ports _instantiate_controller_shadow_projections [still needs to be implemented] • optimizationcontrolmechanism.py: added _update_state_input_ports [**still needed work**]
…rincetonUniversity/PsyNeuLink into refactor/ocm/state_input_ports
added needs_update_controller
- implemented self.needs_update_controller - moved implementation of controlsignal projections from add_controller to _instantiate_control_projections that is called in _complete_init_of_partially_initialized_nodes Note: still need to set self.needs_update_controller to False after instantiating state_input_ports and projections to them
…m/PrincetonUniversity/PsyNeuLink into feat/comp/mult_proj_between_nodes � Conflicts: � psyneulink/core/components/mechanisms/mechanism.py � psyneulink/core/compositions/composition.py
add_projection: working on adding support for projection sets
- add _get_nested_nodes_with_same_roles_at_all_levels - add_linear_processing_pathway: call _get_nested_nodes_with_same_roles_at_all_levels
- add_linear_processing_pathway: add support for inline specification of set of Projections
add_linear_processing_pathway: refactored to support inline specification of sets of Projections
add_linear_processing_pathway: docstring edits for Projection set specification
…m/PrincetonUniversity/PsyNeuLink into feat/comp/mult_proj_between_nodes � Conflicts: � psyneulink/core/compositions/composition.py
…m/PrincetonUniversity/PsyNeuLink into feat/comp/mult_proj_between_nodes
- add test_add_multiple_projections_for_nested_compositions - IN PROGRESS
…m/PrincetonUniversity/PsyNeuLink into feat/comp/mult_proj_between_nodes
- add test_add_multiple_projections_for_nested_compositions - passes
…Link into feat/comp/mult_proj_between_nodes
…Link into feat/comp/mult_proj_between_nodes
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.
• compositioninterfacemechanism.py: add figure and example