Refactor/ocm/state features param #2323
Merged
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
- _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 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
…Link into refactor/ocm/state_features_param
- add state_feature_spec parameter that is assigned value of state_features arg specified in constructor
- replace self._state_feature_specs_parsed with assignments to self.state_feature_specs Parameter (using .spec for user-assigned values): Problems: 1) .spec is a copy, so that evaluation of specified objects fails (e.g., determining whether a specified Mechanism is in the list of INPUT node of agent_rep returned by _get_agent_rep_input_nodes(), as in _validate_input_nodes()) 2) fails in LLVM, even if state_parameter_specs Parameter is included in blacklist in Component._get_compilation_params
…Link into refactor/ocm/state_features_param
- both problems fixed
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.
• optimizationcontrolmechanism.py: