-
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/ocm/state features #2292
Merged
Merged
Feat/ocm/state features #2292
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
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
- _gen_llvm_evaluate_function: num_estimates -> num_estimates_per_trial
- _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
- _update_state_input_ports_for_controller: - skip if ContextFlags.METHOD -> ContextFlags.PROCESSING
- add _validate_state_features - _update_state_input_ports_for_controller: validation of state_features moved to _validate_state_features
- Parameters: add outcome_input_ports and state_input_ports
- move outcome_input_ports Parameter from ocm to controlmechanism - state_features: set to make Parameter on ocm, but waiting to deal with LLVM
- move outcome_input_ports Parameter from ocm to controlmechanism - state_features: set to make Parameter on ocm, but waiting to deal with LLVM
- correct output for fix of typo • test_greedy_agent.py: - test_predator_prey(): reorder args in state_features to fix failure
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:
• controlmechanism.py:
• optimizationcontrolmechanism.py:
• test_ocm_state_feature_specs_and_warnings_and_errors():