-
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
Feat/composition/probes #2236
Feat/composition/probes #2236
Conversation
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
- 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 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)
This PR causes the following changes to the html docs (ubuntu-latest-3.7-x64):
See CI logs for the full diff. |
…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()
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. |
1 similar comment
This PR causes the following changes to the html docs (ubuntu-latest-3.7-x64):
See CI logs for the full diff. |
• composition.py:
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)
• test_composition: