Fix/control/bugs #2261
Merged
Fix/control/bugs #2261
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
docstring mod to **size**
added feature_input_ports attribute and num_feature_input_ports property
added feature_input_ports attribute and num_feature_input_ports property • parameterestimationcomposition.py: fixed misplacement of its Parameters() attribute
added feature_input_ports attribute and num_feature_input_ports property • parameterestimationcomposition.py: fixed misplacement of its Parameters() attribute • optimizationfunctions.py: made num_estimates a Parameter
…Link into feat/ocm/feature_input_ports
…Link into feat/ocm/feature_input_ports
- _instantiate_control_signals: random_seeds -> random_seed_mod_values
- _add_controller: modifying to instantiate feature_input_ports if none are specified
- add_controller: now adds feature_input_ports for Compostion INPUT nodes if not state_features not specified
- _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
…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()
…Link into feat/composition/probes
…Link into feat/composition/probes
- correct path ref • compositioninterfacemechanism.py: - docstring fixes
…Link into devel � Conflicts: � psyneulink/core/components/mechanisms/processing/compositioninterfacemechanism.py
- _add_node_aux_components(): fix bug in which ControlProjections were
getting replaced by MappingProjections in composition.projections
- fix bug in check for name of RANDOMIZATION_CONTROL_SIGNAL
- _create_randomization_control_signal():
warn if num_estimates is >1 and there are no random_variables
• composition.py:
- add_controller: add test for num_estimates before calling
_create_randomization_control_signal()
• test_control
- test_mode_based_num_estimates: add test for random variables (using DDM)
|
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 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:
_create_randomization_control_signal()
getting replaced by MappingProjections in composition.projections
• optimizationcontrolmechanism.py:
warn if num_estimates is >1 and there are no random_variables
• test_control
• show_graph.py
- fix bug in check for name of RANDOMIZATION_CONTROL_SIGNAL