Feat/ocm/node role probe #2232
Merged
Feat/ocm/node role probe #2232
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
- _add_controller: modifying to instantiate feature_input_ports if none are specified
- add_controller: assign simulation_input_ports
- feature_input_ports -> state_input_ports
- _instantiate_input_ports():
state_features only allowed to specifying state_input_ports if
agent_rep is a CompositionFunctionApproximator (i.e., model-free optimization)
• composition.py:
- add_controller: adds state_input_ports to shadow INPUT Nodes of Composition
if controller.agent_rep is Composition (model-based optimziation)
or state_features have not been specified (for model-free optimizaton)
_instantiate_input_ports:
reinstate allowance of state_features specification if agent_rep is a Composition
(i.e., model-based optimization) as long as they are all INPUT Nodes of agent_rep
- _gen_llvm_evaluate_function: num_estimates -> num_estimates_per_trial
- _gen_llvm_evaluate_function: num_estimates -> num_trial_per_estimate
…rincetonUniversity/PsyNeuLink into refactor/ocm/state_input_ports � Conflicts: � psyneulink/core/components/mechanisms/modulatory/control/optimizationcontrolmechanism.py
- _gen_llvm_evaluate_function: num_estimates -> num_trials_per_estimate
…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
- add NodeRole.PROBE
- move implementation of allow_probes from add_controller() to handle_probes() in _get_nested_node_CIM_port()
- refactor _create_CIM_ports() to treat NodeRole.PROBE like an OUTPUT
- TBD: refactor ouput_values and results to ignore values of items in output_CIM outputports
from NodeRole.PROBE (or make that an option)
• optimizationcontrolmechanism.py
- _instantantiate_input_ports: add allow_probes to objective_mechanism
- add NodeRole.PROBE
- move implementation of allow_probes from add_controller() to handle_probes() in _get_nested_node_CIM_port()
- refactor _create_CIM_ports() to treat NodeRole.PROBE like an OUTPUT
- TBD: refactor ouput_values and results to ignore values of items in output_CIM outputports
from NodeRole.PROBE (or make that an option)
• optimizationcontrolmechanism.py
- _instantantiate_input_ports: add allow_probes to objective_mechanism
…cetonUniversity/PsyNeuLink into feat/ocm/NodeRole_PROBE � Conflicts: � psyneulink/core/compositions/composition.py
…Link into feat/ocm/NodeRole_PROBE � Conflicts: � psyneulink/core/components/mechanisms/modulatory/control/optimizationcontrolmechanism.py
add _sender_is_probe method • test_args_specific_to_ocm: - add assertion regarding identification of probe in allowable2
- execute():
- filter results to exclude values of PROBE nodes
- TBD: implement same for LLVM execution
• compositioninterfacemechanism.py:
add _get_destination_node_for_input_port() and _get_source_node_for_output_port() methods
_sender_is_probe(): method uses _get_source_node_for_output_port()
- test_args_specific_to_ocm:
add test that PROBE nodes are excluded from Composition.output_values (and therefore results)
|
This PR causes the following changes to the html docs (ubuntu-latest-3.7-x64): See CI logs for the full diff. |
|
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 eb28d2b into 52c626d - view on LGTM.com new alerts:
|
|
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 8186e9e into 52c626d - 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.
• composition.py:
• compositioninterfacemechanism.py:
• optimizationcontrolmechanism.py
• test_args_specific_to_ocm:
• test_control.py / test_args_specific_to_ocm: