Fix/ocm/state features for nested comps #2329

jdcpni · 2022-02-22T01:03:45Z

• optimizationcontrolmechanism.py:

state_features, _update_state_feature_dicts():
- enforce that all keys are mechanisms to standardize handling of nested comps
- standardize names of deferred nodes
clean-up state features for CFA agent_rep
mods to docstring

…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

…Link into refactor/ocm/state_input_ports � Conflicts: � tests/composition/test_control.py

…Link into devel

- _function: refactored to put use aggregation_function at end - _grid_evaluate: still needs to return all_samples

…rincetonUniversity/PsyNeuLink into refactor/ocm/state_input_ports � Conflicts: � psyneulink/core/components/mechanisms/modulatory/control/optimizationcontrolmechanism.py

- added call to _update_controller to add_node - moved test for projections to controller.state_input_ports to run()

…Link into refactor/ocm/state_input_ports

moved calls to _update_controller to _complete_init_of_partially_initialized_nodes moved _update_controller to ocm._update_state_input_ports • optimizationcontrolmechanism.py: added _update_state_input_ports [**still needed work**]

moved calls to _update_controller to _complete_init_of_partially_initialized_nodes moved _update_controller to ocm._update_state_input_ports _instantiate_controller_shadow_projections [still needs to be implemented] • optimizationcontrolmechanism.py: added _update_state_input_ports [**still needed work**]

…rincetonUniversity/PsyNeuLink into refactor/ocm/state_input_ports

added needs_update_controller

- add test_no_path_afferents() - add test_no_efferents()

…Link into devel

- clean-up of state features for CFA agent_rep

- BEFORE ADDITIONAL MODIFICATION OF HANDLING OF DEFERRED INITS

MODIFICATION OF HANDLING OF DEFERRED INITS: - _update_state_feature_dicts() - state_features

• optimizationcontrolmechanism.py: - state_features: enforce that all keys are mechanisms, including ones in nest comps

• optimizationcontrolmechanism.py: update docstring

…Link into fix/ocm/state_features_for_nested_comps

github-actions · 2022-02-22T01:15:40Z

This PR causes the following changes to the html docs (ubuntu-latest-3.7-x64):

diff -r docs-base/OptimizationControlMechanism.html docs-head/OptimizationControlMechanism.html
428c428
< <p id="optimizationcontrolmechanism-agent-rep-composition"><strong>state_features</strong> for an agent_rep that is a* <strong>Composition</strong></p>
---
> <p id="optimizationcontrolmechanism-agent-rep-composition"><strong>state_features</strong> <em>for an agent_rep that is a</em> <strong>Composition</strong></p>
432c432
< <p>The <strong>state_features</strong> specify the inputs to the  Composition assigned as the <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">agent_rep</span></code></a> when it is executed by the OptimizationControlMechanism to
---
> <p id="optimizationcontrolmechanism-state-features-automatic-assignment"><em>Automatic assignment.</em> The <strong>state_features</strong> specify the inputs to the  Composition assigned as the <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">agent_rep</span></code></a> when it is executed by the OptimizationControlMechanism to
442,449c442,450
< <p>The <strong>state_features</strong> argument can also be specified explicitly, using the formats described below.  This is
< useful if values other than the <a class="reference internal" href="Composition.html#composition-execution-inputs"><span class="std std-ref">external inputs</span></a> to the <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">agent_rep</span></code></a> Composition are to be used to evaluate it, to restrict evaluation
< This allows values other than the <a class="reference internal" href="Composition.html#composition-execution-inputs"><span class="std std-ref">external inputs</span></a> to the <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">agent_rep</span></code></a> Composition to be used to evaluate it; to restrict evaluation to a
< subset of inputs (while others are held constant); and/or to assign specific functions to one or more
< <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.state_input_ports" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.state_input_ports"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">state_input_ports</span></code></a> that allow them to process inputs
< (e.g., modulate and/or intergrate them) before them as <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.state_feature_values" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.state_feature_values"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">state_feature_values</span> <span class="pre">state_feature_values</span></code></a> (see <a class="reference internal" href="#optimizationcontrolmechanism-state-feature-function-arg"><span class="std std-ref">below</span></a>). Note that assigning <strong>state_features</strong> explicitly
< overrides their automatic assignment, so that all required values must be specified, and this must be done
< accurate, as described below.</p>
---
> <p id="optimizationcontrolmechanism-state-features-explicit-specification"><em>Explicit specificaiont.</em> The <strong>state_features</strong> argument can also be specified explicitly, using the formats
> described below.  This is useful if values other than the <a class="reference internal" href="Composition.html#composition-execution-inputs"><span class="std std-ref">external inputs</span></a> to
> the <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">agent_rep</span></code></a> Composition are to be used to evaluate it, to restrict
> evaluation This allows values other than the <a class="reference internal" href="Composition.html#composition-execution-inputs"><span class="std std-ref">external inputs</span></a> to the <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">agent_rep</span></code></a> Composition to be used to evaluate it; to restrict evaluation to a subset
> of inputs (while others are held constant); and/or to assign specific functions to one or more <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.state_input_ports" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.state_input_ports"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">state_input_ports</span></code></a> that allow them to process inputs (e.g., modulate and/or integrate
> them) before them as <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.state_feature_values" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.state_feature_values"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">state_feature_values</span> <span class="pre">state_feature_values</span></code></a>
> (see <a class="reference internal" href="#optimizationcontrolmechanism-state-feature-function-arg"><span class="std std-ref">below</span></a>). Note that assigning <strong>state_features</strong>
> explicitly overrides their automatic assignment, so that all required values must be specified, and this must be
> done accurate, as described below.</p>
472c473
< specifications listed <a class="reference internal" href="#optimization-control-mechanism-state-feature-individual-inputs"><span class="std std-ref">below</span></a>.  The items
---
> specifications listed <a class="reference internal" href="#optimization-control-mechanism-state-feature-individual-inputs"><span class="std std-ref">below</span></a>. The items
475,476c476,482
< the remaining INPUT Nodes are assigned their <a class="reference internal" href="Component.html#psyneulink.core.components.component.Component.defaults" title="psyneulink.core.components.component.Component.defaults"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">default</span> <span class="pre">variable</span></code></a> as input when the <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">agent_rep</span></code></a>'s <a class="reference internal" href="Composition.html#psyneulink.core.compositions.composition.Composition.evaluate" title="psyneulink.core.compositions.composition.Composition.evaluate"><code class="xref any py py-meth docutils literal notranslate"><span class="pre">evaluate</span></code></a> method is called;  <code class="docutils literal notranslate"><span class="pre">None</span></code> can
< be used as an entry to “skip” items in the list (i.e., specify that they receive their <a class="reference internal" href="Component.html#psyneulink.core.components.component.Component.defaults" title="psyneulink.core.components.component.Component.defaults"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">default</span> <span class="pre">variable</span></code></a> as input).</p></li>
---
> the remaining INPUT Nodes are assigned their <a class="reference internal" href="Component.html#psyneulink.core.components.component.Component.defaults" title="psyneulink.core.components.component.Component.defaults"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">default</span> <span class="pre">variable</span></code></a> as input when the <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">agent_rep</span></code></a>'s <a class="reference internal" href="Composition.html#psyneulink.core.compositions.composition.Composition.evaluate" title="psyneulink.core.compositions.composition.Composition.evaluate"><code class="xref any py py-meth docutils literal notranslate"><span class="pre">evaluate</span></code></a> method is called; <code class="docutils literal notranslate"><span class="pre">None</span></code> can
> be used as an entry to “skip” items in the list (i.e., specify that they receive their <a class="reference internal" href="Component.html#psyneulink.core.components.component.Component.defaults" title="psyneulink.core.components.component.Component.defaults"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">default</span> <span class="pre">variable</span></code></a> as input). Items can be specified in the list that have not yet been added to the
> OptimizationControlMechanism’s Composition or its <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">agent_rep</span></code></a>, that are
> either sources of input to <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">agent_rep</span></code></a>'s  <a class="reference internal" href="Composition.html#psyneulink.core.compositions.composition.NodeRole.INPUT" title="psyneulink.core.compositions.composition.NodeRole.INPUT"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">INPUT</span></code></a>
> <a class="reference internal" href="Composition.html#composition-nodes"><span class="std std-ref">Nodes</span></a>, or those Nodes themselves.  However, these must be added before Composition is
> executed, and must appear in the list in the same position that the <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">INPUT</span> <span class="pre">Nodes</span> <span class="pre">to</span> <span class="pre">which</span> <span class="pre">they</span> <span class="pre">pertain</span> <span class="pre">are</span>
> <span class="pre">list</span> <span class="pre">in</span> <span class="pre">the</span> <span class="pre">`agent_rep</span></code></a>'s <a class="reference internal" href="Composition.html#psyneulink.core.compositions.composition.Composition.nodes" title="psyneulink.core.compositions.composition.Composition.nodes"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">nodes</span></code></a> attribute.</p></li>
501c507
< <ul class="simple">
---
> <ul class="simple" id="optimization-control-mechanism-numeric-state-feature">
506c512
< <ul class="simple">
---
> <ul class="simple" id="optimization-control-mechanism-tuple-state-feature">
514c520
< <ul class="simple">
---
> <ul class="simple" id="optimization-control-mechanism-input-port-dict-state-feature">
519c525
< <ul>
---
> <ul id="optimization-control-mechanism-input-port-state-feature">
544c550
< <ul class="simple">
---
> <ul class="simple" id="optimization-control-mechanism-output-port-state-feature">
557,561c563
< specified explicitly (as described <a class="reference internal" href="#optimization-control-mechanism-output-port-state-feature"><span class="std std-ref">above</span></a>).  In
< contrast, if the <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">agent_rep</span></code></a> is a <a class="reference internal" href="CompositionFunctionApproximator.html"><span class="doc">CompositionFunctionApproximator</span></a>,
< then the Mechanism’s <a class="reference internal" href="OutputPort.html#outputport-primary"><span class="std std-ref">primary OutputPort</span></a> is used (since that is typical usage, and there
< are no assumptions made about the state features of a <a class="reference internal" href="CompositionFunctionApproximator.html"><span class="doc">CompositionFunctionApproximator</span></a>); if the input to the
< Mechanism <em>is</em> to be shadowed, then its InputPort must be specified explicitly (as described <a class="reference internal" href="#optimization-control-mechanism-input-port-state-feature"><span class="std std-ref">above</span></a>).</p></li>
---
> specified explicitly (as described <a class="reference internal" href="#optimization-control-mechanism-output-port-state-feature"><span class="std std-ref">above</span></a>).</p></li>
572,576c574,578
< <p><strong>state_features</strong> specify the <strong>feature_values</strong>
< argument to the CompositionFunctionApproximator’s <a class="reference internal" href="CompositionFunctionApproximator.html#psyneulink.core.compositions.compositionfunctionapproximator.CompositionFunctionApproximator.evaluate" title="psyneulink.core.compositions.compositionfunctionapproximator.CompositionFunctionApproximator.evaluate"><code class="xref any py py-meth docutils literal notranslate"><span class="pre">evalu
...

See CI logs for the full diff.

github-actions · 2022-02-22T01:16:54Z

This PR causes the following changes to the html docs (ubuntu-latest-3.7-x64):

diff -r docs-base/OptimizationControlMechanism.html docs-head/OptimizationControlMechanism.html
428c428
< <p id="optimizationcontrolmechanism-agent-rep-composition"><strong>state_features</strong> for an agent_rep that is a* <strong>Composition</strong></p>
---
> <p id="optimizationcontrolmechanism-agent-rep-composition"><strong>state_features</strong> <em>for an agent_rep that is a</em> <strong>Composition</strong></p>
432c432
< <p>The <strong>state_features</strong> specify the inputs to the  Composition assigned as the <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">agent_rep</span></code></a> when it is executed by the OptimizationControlMechanism to
---
> <p id="optimizationcontrolmechanism-state-features-automatic-assignment"><em>Automatic assignment.</em> The <strong>state_features</strong> specify the inputs to the  Composition assigned as the <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">agent_rep</span></code></a> when it is executed by the OptimizationControlMechanism to
442,449c442,450
< <p>The <strong>state_features</strong> argument can also be specified explicitly, using the formats described below.  This is
< useful if values other than the <a class="reference internal" href="Composition.html#composition-execution-inputs"><span class="std std-ref">external inputs</span></a> to the <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">agent_rep</span></code></a> Composition are to be used to evaluate it, to restrict evaluation
< This allows values other than the <a class="reference internal" href="Composition.html#composition-execution-inputs"><span class="std std-ref">external inputs</span></a> to the <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">agent_rep</span></code></a> Composition to be used to evaluate it; to restrict evaluation to a
< subset of inputs (while others are held constant); and/or to assign specific functions to one or more
< <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.state_input_ports" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.state_input_ports"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">state_input_ports</span></code></a> that allow them to process inputs
< (e.g., modulate and/or intergrate them) before them as <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.state_feature_values" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.state_feature_values"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">state_feature_values</span> <span class="pre">state_feature_values</span></code></a> (see <a class="reference internal" href="#optimizationcontrolmechanism-state-feature-function-arg"><span class="std std-ref">below</span></a>). Note that assigning <strong>state_features</strong> explicitly
< overrides their automatic assignment, so that all required values must be specified, and this must be done
< accurate, as described below.</p>
---
> <p id="optimizationcontrolmechanism-state-features-explicit-specification"><em>Explicit specificaiont.</em> The <strong>state_features</strong> argument can also be specified explicitly, using the formats
> described below.  This is useful if values other than the <a class="reference internal" href="Composition.html#composition-execution-inputs"><span class="std std-ref">external inputs</span></a> to
> the <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">agent_rep</span></code></a> Composition are to be used to evaluate it, to restrict
> evaluation This allows values other than the <a class="reference internal" href="Composition.html#composition-execution-inputs"><span class="std std-ref">external inputs</span></a> to the <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">agent_rep</span></code></a> Composition to be used to evaluate it; to restrict evaluation to a subset
> of inputs (while others are held constant); and/or to assign specific functions to one or more <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.state_input_ports" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.state_input_ports"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">state_input_ports</span></code></a> that allow them to process inputs (e.g., modulate and/or integrate
> them) before them as <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.state_feature_values" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.state_feature_values"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">state_feature_values</span> <span class="pre">state_feature_values</span></code></a>
> (see <a class="reference internal" href="#optimizationcontrolmechanism-state-feature-function-arg"><span class="std std-ref">below</span></a>). Note that assigning <strong>state_features</strong>
> explicitly overrides their automatic assignment, so that all required values must be specified, and this must be
> done accurate, as described below.</p>
472c473
< specifications listed <a class="reference internal" href="#optimization-control-mechanism-state-feature-individual-inputs"><span class="std std-ref">below</span></a>.  The items
---
> specifications listed <a class="reference internal" href="#optimization-control-mechanism-state-feature-individual-inputs"><span class="std std-ref">below</span></a>. The items
475,476c476,482
< the remaining INPUT Nodes are assigned their <a class="reference internal" href="Component.html#psyneulink.core.components.component.Component.defaults" title="psyneulink.core.components.component.Component.defaults"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">default</span> <span class="pre">variable</span></code></a> as input when the <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">agent_rep</span></code></a>'s <a class="reference internal" href="Composition.html#psyneulink.core.compositions.composition.Composition.evaluate" title="psyneulink.core.compositions.composition.Composition.evaluate"><code class="xref any py py-meth docutils literal notranslate"><span class="pre">evaluate</span></code></a> method is called;  <code class="docutils literal notranslate"><span class="pre">None</span></code> can
< be used as an entry to “skip” items in the list (i.e., specify that they receive their <a class="reference internal" href="Component.html#psyneulink.core.components.component.Component.defaults" title="psyneulink.core.components.component.Component.defaults"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">default</span> <span class="pre">variable</span></code></a> as input).</p></li>
---
> the remaining INPUT Nodes are assigned their <a class="reference internal" href="Component.html#psyneulink.core.components.component.Component.defaults" title="psyneulink.core.components.component.Component.defaults"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">default</span> <span class="pre">variable</span></code></a> as input when the <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">agent_rep</span></code></a>'s <a class="reference internal" href="Composition.html#psyneulink.core.compositions.composition.Composition.evaluate" title="psyneulink.core.compositions.composition.Composition.evaluate"><code class="xref any py py-meth docutils literal notranslate"><span class="pre">evaluate</span></code></a> method is called; <code class="docutils literal notranslate"><span class="pre">None</span></code> can
> be used as an entry to “skip” items in the list (i.e., specify that they receive their <a class="reference internal" href="Component.html#psyneulink.core.components.component.Component.defaults" title="psyneulink.core.components.component.Component.defaults"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">default</span> <span class="pre">variable</span></code></a> as input). Items can be specified in the list that have not yet been added to the
> OptimizationControlMechanism’s Composition or its <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">agent_rep</span></code></a>, that are
> either sources of input to <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">agent_rep</span></code></a>'s  <a class="reference internal" href="Composition.html#psyneulink.core.compositions.composition.NodeRole.INPUT" title="psyneulink.core.compositions.composition.NodeRole.INPUT"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">INPUT</span></code></a>
> <a class="reference internal" href="Composition.html#composition-nodes"><span class="std std-ref">Nodes</span></a>, or those Nodes themselves.  However, these must be added before Composition is
> executed, and must appear in the list in the same position that the <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">INPUT</span> <span class="pre">Nodes</span> <span class="pre">to</span> <span class="pre">which</span> <span class="pre">they</span> <span class="pre">pertain</span> <span class="pre">are</span>
> <span class="pre">list</span> <span class="pre">in</span> <span class="pre">the</span> <span class="pre">`agent_rep</span></code></a>'s <a class="reference internal" href="Composition.html#psyneulink.core.compositions.composition.Composition.nodes" title="psyneulink.core.compositions.composition.Composition.nodes"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">nodes</span></code></a> attribute.</p></li>
501c507
< <ul class="simple">
---
> <ul class="simple" id="optimization-control-mechanism-numeric-state-feature">
506c512
< <ul class="simple">
---
> <ul class="simple" id="optimization-control-mechanism-tuple-state-feature">
514c520
< <ul class="simple">
---
> <ul class="simple" id="optimization-control-mechanism-input-port-dict-state-feature">
519c525
< <ul>
---
> <ul id="optimization-control-mechanism-input-port-state-feature">
544c550
< <ul class="simple">
---
> <ul class="simple" id="optimization-control-mechanism-output-port-state-feature">
557,561c563
< specified explicitly (as described <a class="reference internal" href="#optimization-control-mechanism-output-port-state-feature"><span class="std std-ref">above</span></a>).  In
< contrast, if the <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">agent_rep</span></code></a> is a <a class="reference internal" href="CompositionFunctionApproximator.html"><span class="doc">CompositionFunctionApproximator</span></a>,
< then the Mechanism’s <a class="reference internal" href="OutputPort.html#outputport-primary"><span class="std std-ref">primary OutputPort</span></a> is used (since that is typical usage, and there
< are no assumptions made about the state features of a <a class="reference internal" href="CompositionFunctionApproximator.html"><span class="doc">CompositionFunctionApproximator</span></a>); if the input to the
< Mechanism <em>is</em> to be shadowed, then its InputPort must be specified explicitly (as described <a class="reference internal" href="#optimization-control-mechanism-input-port-state-feature"><span class="std std-ref">above</span></a>).</p></li>
---
> specified explicitly (as described <a class="reference internal" href="#optimization-control-mechanism-output-port-state-feature"><span class="std std-ref">above</span></a>).</p></li>
572,576c574,578
< <p><strong>state_features</strong> specify the <strong>feature_values</strong>
< argument to the CompositionFunctionApproximator’s <a class="reference internal" href="CompositionFunctionApproximator.html#psyneulink.core.compositions.compositionfunctionapproximator.CompositionFunctionApproximator.evaluate" title="psyneulink.core.compositions.compositionfunctionapproximator.CompositionFunctionApproximator.evaluate"><code class="xref any py py-meth docutils literal notranslate"><span class="pre">evalu
...

See CI logs for the full diff.

lgtm-com · 2022-02-22T02:00:33Z

This pull request introduces 3 alerts when merging 1a1ecec into 31c15ce - view on LGTM.com

new alerts:

2 for Unused local variable
1 for Variable defined multiple times

…hub.com/PrincetonUniversity/PsyNeuLink into fix/ocm/state_features_for_nested_comps

github-actions · 2022-02-22T14:37:16Z

This PR causes the following changes to the html docs (ubuntu-latest-3.7-x64):

diff -r docs-base/OptimizationControlMechanism.html docs-head/OptimizationControlMechanism.html
428c428
< <p id="optimizationcontrolmechanism-agent-rep-composition"><strong>state_features</strong> for an agent_rep that is a* <strong>Composition</strong></p>
---
> <p id="optimizationcontrolmechanism-agent-rep-composition"><strong>state_features</strong> <em>for an agent_rep that is a</em> <strong>Composition</strong></p>
432c432
< <p>The <strong>state_features</strong> specify the inputs to the  Composition assigned as the <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">agent_rep</span></code></a> when it is executed by the OptimizationControlMechanism to
---
> <p id="optimizationcontrolmechanism-state-features-automatic-assignment"><em>Automatic assignment.</em> The <strong>state_features</strong> specify the inputs to the  Composition assigned as the <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">agent_rep</span></code></a> when it is executed by the OptimizationControlMechanism to
442,449c442,450
< <p>The <strong>state_features</strong> argument can also be specified explicitly, using the formats described below.  This is
< useful if values other than the <a class="reference internal" href="Composition.html#composition-execution-inputs"><span class="std std-ref">external inputs</span></a> to the <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">agent_rep</span></code></a> Composition are to be used to evaluate it, to restrict evaluation
< This allows values other than the <a class="reference internal" href="Composition.html#composition-execution-inputs"><span class="std std-ref">external inputs</span></a> to the <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">agent_rep</span></code></a> Composition to be used to evaluate it; to restrict evaluation to a
< subset of inputs (while others are held constant); and/or to assign specific functions to one or more
< <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.state_input_ports" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.state_input_ports"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">state_input_ports</span></code></a> that allow them to process inputs
< (e.g., modulate and/or intergrate them) before them as <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.state_feature_values" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.state_feature_values"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">state_feature_values</span> <span class="pre">state_feature_values</span></code></a> (see <a class="reference internal" href="#optimizationcontrolmechanism-state-feature-function-arg"><span class="std std-ref">below</span></a>). Note that assigning <strong>state_features</strong> explicitly
< overrides their automatic assignment, so that all required values must be specified, and this must be done
< accurate, as described below.</p>
---
> <p id="optimizationcontrolmechanism-state-features-explicit-specification"><em>Explicit specificaiont.</em> The <strong>state_features</strong> argument can also be specified explicitly, using the formats
> described below.  This is useful if values other than the <a class="reference internal" href="Composition.html#composition-execution-inputs"><span class="std std-ref">external inputs</span></a> to
> the <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">agent_rep</span></code></a> Composition are to be used to evaluate it, to restrict
> evaluation This allows values other than the <a class="reference internal" href="Composition.html#composition-execution-inputs"><span class="std std-ref">external inputs</span></a> to the <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">agent_rep</span></code></a> Composition to be used to evaluate it; to restrict evaluation to a subset
> of inputs (while others are held constant); and/or to assign specific functions to one or more <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.state_input_ports" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.state_input_ports"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">state_input_ports</span></code></a> that allow them to process inputs (e.g., modulate and/or integrate
> them) before them as <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.state_feature_values" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.state_feature_values"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">state_feature_values</span> <span class="pre">state_feature_values</span></code></a>
> (see <a class="reference internal" href="#optimizationcontrolmechanism-state-feature-function-arg"><span class="std std-ref">below</span></a>). Note that assigning <strong>state_features</strong>
> explicitly overrides their automatic assignment, so that all required values must be specified, and this must be
> done accurate, as described below.</p>
472c473
< specifications listed <a class="reference internal" href="#optimization-control-mechanism-state-feature-individual-inputs"><span class="std std-ref">below</span></a>.  The items
---
> specifications listed <a class="reference internal" href="#optimization-control-mechanism-state-feature-individual-inputs"><span class="std std-ref">below</span></a>. The items
475,476c476,482
< the remaining INPUT Nodes are assigned their <a class="reference internal" href="Component.html#psyneulink.core.components.component.Component.defaults" title="psyneulink.core.components.component.Component.defaults"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">default</span> <span class="pre">variable</span></code></a> as input when the <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">agent_rep</span></code></a>'s <a class="reference internal" href="Composition.html#psyneulink.core.compositions.composition.Composition.evaluate" title="psyneulink.core.compositions.composition.Composition.evaluate"><code class="xref any py py-meth docutils literal notranslate"><span class="pre">evaluate</span></code></a> method is called;  <code class="docutils literal notranslate"><span class="pre">None</span></code> can
< be used as an entry to “skip” items in the list (i.e., specify that they receive their <a class="reference internal" href="Component.html#psyneulink.core.components.component.Component.defaults" title="psyneulink.core.components.component.Component.defaults"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">default</span> <span class="pre">variable</span></code></a> as input).</p></li>
---
> the remaining INPUT Nodes are assigned their <a class="reference internal" href="Component.html#psyneulink.core.components.component.Component.defaults" title="psyneulink.core.components.component.Component.defaults"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">default</span> <span class="pre">variable</span></code></a> as input when the <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">agent_rep</span></code></a>'s <a class="reference internal" href="Composition.html#psyneulink.core.compositions.composition.Composition.evaluate" title="psyneulink.core.compositions.composition.Composition.evaluate"><code class="xref any py py-meth docutils literal notranslate"><span class="pre">evaluate</span></code></a> method is called; <code class="docutils literal notranslate"><span class="pre">None</span></code> can
> be used as an entry to “skip” items in the list (i.e., specify that they receive their <a class="reference internal" href="Component.html#psyneulink.core.components.component.Component.defaults" title="psyneulink.core.components.component.Component.defaults"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">default</span> <span class="pre">variable</span></code></a> as input). Items can be specified in the list that have not yet been added to the
> OptimizationControlMechanism’s Composition or its <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">agent_rep</span></code></a>, that are
> either sources of input to <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">agent_rep</span></code></a>'s  <a class="reference internal" href="Composition.html#psyneulink.core.compositions.composition.NodeRole.INPUT" title="psyneulink.core.compositions.composition.NodeRole.INPUT"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">INPUT</span></code></a>
> <a class="reference internal" href="Composition.html#composition-nodes"><span class="std std-ref">Nodes</span></a>, or those Nodes themselves.  However, these must be added before Composition is
> executed, and must appear in the list in the same position that the <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">INPUT</span> <span class="pre">Nodes</span> <span class="pre">to</span> <span class="pre">which</span> <span class="pre">they</span> <span class="pre">pertain</span> <span class="pre">are</span>
> <span class="pre">list</span> <span class="pre">in</span> <span class="pre">the</span> <span class="pre">`agent_rep</span></code></a>'s <a class="reference internal" href="Composition.html#psyneulink.core.compositions.composition.Composition.nodes" title="psyneulink.core.compositions.composition.Composition.nodes"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">nodes</span></code></a> attribute.</p></li>
501c507
< <ul class="simple">
---
> <ul class="simple" id="optimization-control-mechanism-numeric-state-feature">
506c512
< <ul class="simple">
---
> <ul class="simple" id="optimization-control-mechanism-tuple-state-feature">
514c520
< <ul class="simple">
---
> <ul class="simple" id="optimization-control-mechanism-input-port-dict-state-feature">
519c525
< <ul>
---
> <ul id="optimization-control-mechanism-input-port-state-feature">
544c550
< <ul class="simple">
---
> <ul class="simple" id="optimization-control-mechanism-output-port-state-feature">
557,561c563
< specified explicitly (as described <a class="reference internal" href="#optimization-control-mechanism-output-port-state-feature"><span class="std std-ref">above</span></a>).  In
< contrast, if the <a class="reference internal" href="#psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep" title="psyneulink.core.components.mechanisms.modulatory.control.optimizationcontrolmechanism.OptimizationControlMechanism.agent_rep"><code class="xref any py py-attr docutils literal notranslate"><span class="pre">agent_rep</span></code></a> is a <a class="reference internal" href="CompositionFunctionApproximator.html"><span class="doc">CompositionFunctionApproximator</span></a>,
< then the Mechanism’s <a class="reference internal" href="OutputPort.html#outputport-primary"><span class="std std-ref">primary OutputPort</span></a> is used (since that is typical usage, and there
< are no assumptions made about the state features of a <a class="reference internal" href="CompositionFunctionApproximator.html"><span class="doc">CompositionFunctionApproximator</span></a>); if the input to the
< Mechanism <em>is</em> to be shadowed, then its InputPort must be specified explicitly (as described <a class="reference internal" href="#optimization-control-mechanism-input-port-state-feature"><span class="std std-ref">above</span></a>).</p></li>
---
> specified explicitly (as described <a class="reference internal" href="#optimization-control-mechanism-output-port-state-feature"><span class="std std-ref">above</span></a>).</p></li>
572,576c574,578
< <p><strong>state_features</strong> specify the <strong>feature_values</strong>
< argument to the CompositionFunctionApproximator’s <a class="reference internal" href="CompositionFunctionApproximator.html#psyneulink.core.compositions.compositionfunctionapproximator.CompositionFunctionApproximator.evaluate" title="psyneulink.core.compositions.compositionfunctionapproximator.CompositionFunctionApproximator.evaluate"><code class="xref any py py-meth docutils literal notranslate"><span class="pre">evalu
...

See CI logs for the full diff.

lgtm-com · 2022-02-22T16:07:55Z

This pull request introduces 1 alert when merging b67f617 into 31c15ce - view on LGTM.com

new alerts:

1 for Variable defined multiple times

coveralls · 2022-02-22T18:16:58Z

Coverage decreased (-0.002%) to 84.389% when pulling b67f617 on fix/ocm/state_features_for_nested_comps into 31c15ce on devel.

jdcpni and others added 30 commits November 10, 2021 19:50

Merge branch 'refactor/ocm/state_input_ports' of https://github.com/P…

bdb12fb

…rincetonUniversity/PsyNeuLink into refactor/ocm/state_input_ports � Conflicts: � psyneulink/core/components/mechanisms/modulatory/control/optimizationcontrolmechanism.py

• optimizationcontrolmechanism.py

c1b3000

- _gen_llvm_evaluate_function: num_estimates -> num_trials_per_estimate

-

7ca8a0b

-

d1010fd

Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…

e57cd2d

…Link into refactor/ocm/state_input_ports

Merge branch 'fix/ocm/llvm_num_estimates' into refactor/ocm/state_inp…

0ff99ec

…ut_ports # Conflicts: # psyneulink/core/components/mechanisms/modulatory/control/optimizationcontrolmechanism.py

-

3607a9a

-

6017b7b

• composition.py

2395f7e

- __init__: moved controller instantiation until after nodes, projections and pathways

• composition.py

f317567

- __init__: restored add_controller position

llvm/struct generation: Make sure num_estimats per trial is always in…

8edacf6

…teger Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>

-

8ed5e87

Merge branch 'fix/ocm/llvm_num_estimates' into refactor/ocm/state_inp…

bcfbae9

…ut_ports # Conflicts: # psyneulink/core/llvm/builder_context.py

Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…

8a564aa

…Link into refactor/ocm/state_input_ports

• composition.py:

883b49d

- _update_controller: added - add_controller and _analyze_graph(): call _update_controller

-

d2faa86

• composition.py

a632f72

_update_controller: fixed to loop through all input_ports of comp INPUT nodes

• test_control.py

0e1a32e

- test_agent_rep_assignement_as_controller_and_replacement: updated to test that shadowing projections to state_input_ports are properly added and deleted

Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…

1d996fb

…Link into refactor/ocm/state_input_ports � Conflicts: � tests/composition/test_control.py

Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…

cbe6d24

…Link into devel

• optimizationfunctions.py:

3856bdd

- _function: refactored to put use aggregation_function at end - _grid_evaluate: still needs to return all_samples

Merge branch 'refactor/ocm/state_input_ports' of https://github.com/P…

0eb6514

…rincetonUniversity/PsyNeuLink into refactor/ocm/state_input_ports � Conflicts: � psyneulink/core/components/mechanisms/modulatory/control/optimizationcontrolmechanism.py

-

4b2fe4a

• composition.py

d580849

- added call to _update_controller to add_node - moved test for projections to controller.state_input_ports to run()

-

79b6ed6

Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…

1a5dd50

…Link into refactor/ocm/state_input_ports

• composition.py:

34b179e

moved calls to _update_controller to _complete_init_of_partially_initialized_nodes moved _update_controller to ocm._update_state_input_ports • optimizationcontrolmechanism.py: added _update_state_input_ports [**still needed work**]

Merge branch 'refactor/ocm/state_input_ports' of https://github.com/P…

38e5bae

…rincetonUniversity/PsyNeuLink into refactor/ocm/state_input_ports

• composition.py

d487a4c

added needs_update_controller

jdcpni added 20 commits February 18, 2022 07:42

• test_parameter_ports.py:

1fb7793

- add test_no_path_afferents() - add test_no_efferents()

-

82ef44c

-

1c91cc4

Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…

5760b68

…Link into devel

Merge branch 'docs/ocm/clean_up' into devel

81b86bc

• optimizationcontrolmechanism.py:

d5f0f62

- clean-up of state features for CFA agent_rep

-

20b64de

-

504d121

-

726cc4c

-

2c196df

• optimizationcontrolmechanism.py: docstring mods

c2ab314

- BEFORE ADDITIONAL MODIFICATION OF HANDLING OF DEFERRED INITS

• optimizationcontrolmechanism.py:

e10a041

MODIFICATION OF HANDLING OF DEFERRED INITS: - _update_state_feature_dicts() - state_features

-

fdb548d

PASSES ALL TESTS

318876d

• optimizationcontrolmechanism.py: - state_features: enforce that all keys are mechanisms, including ones in nest comps

PASSES ALL TESTS

696aa0e

• optimizationcontrolmechanism.py: update docstring

-

1b2eb0c

-

a9b12b5

-

601ae64

Merge branch 'devel' into fix/ocm/state_features_for_nested_comps

1a1ecec

Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…

684608a

…Link into fix/ocm/state_features_for_nested_comps

jdcpni added 2 commits February 22, 2022 09:23

-

fd474ed

Merge branch 'fix/ocm/state_features_for_nested_comps' of https://git…

b67f617

…hub.com/PrincetonUniversity/PsyNeuLink into fix/ocm/state_features_for_nested_comps

jdcpni merged commit 7b4abd2 into devel Feb 22, 2022

jdcpni deleted the fix/ocm/state_features_for_nested_comps branch February 22, 2022 16:16

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix/ocm/state features for nested comps #2329

Fix/ocm/state features for nested comps #2329

jdcpni commented Feb 22, 2022

github-actions bot commented Feb 22, 2022

github-actions bot commented Feb 22, 2022

lgtm-com bot commented Feb 22, 2022

github-actions bot commented Feb 22, 2022

lgtm-com bot commented Feb 22, 2022

coveralls commented Feb 22, 2022

Fix/ocm/state features for nested comps #2329

Fix/ocm/state features for nested comps #2329

Conversation

jdcpni commented Feb 22, 2022

github-actions bot commented Feb 22, 2022

github-actions bot commented Feb 22, 2022

lgtm-com bot commented Feb 22, 2022

github-actions bot commented Feb 22, 2022

lgtm-com bot commented Feb 22, 2022

coveralls commented Feb 22, 2022