Skip to content
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

Test/ocm/state feat fct dict #2303

Merged
merged 16 commits into from
Feb 4, 2022
Merged

Test/ocm/state feat fct dict #2303

merged 16 commits into from
Feb 4, 2022

Conversation

jdcpni
Copy link
Collaborator

@jdcpni jdcpni commented Feb 4, 2022

• optimizationcontrolmechanism.py:

  • _parse_state_feature_specs(): support InputPort specification dictionary in state_features specification

• test_control.py:

  • test_state_feature_function_specs(): add port_spec_dict_in_feat_dict condition

jdcpni and others added 16 commits November 15, 2021 14:44
…Link into devel

� Conflicts:
�	psyneulink/core/components/mechanisms/modulatory/control/optimizationcontrolmechanism.py
  - test_state_feature_function_specs():  add test InputPort specification dict in state_feature dict
  - _parse_state_feature_specs(): support InputPort specification dictionary in state_features specification

• test_control.py:
  - test_state_feature_function_specs(): add port_spec_dict_in_feat_dict condition
@github-actions
Copy link

github-actions bot commented Feb 4, 2022

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
1407c1407,1408
< <p>Return state_input_port_dicts with FUNCTION entries added as appropriate.</p>
---
> <p>Assignment of function to dict specs handled above, so skip here
> Return state_input_port_dicts with FUNCTION entries added as appropriate.</p>

...

See CI logs for the full diff.

1 similar comment
@github-actions
Copy link

github-actions bot commented Feb 4, 2022

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
1407c1407,1408
< <p>Return state_input_port_dicts with FUNCTION entries added as appropriate.</p>
---
> <p>Assignment of function to dict specs handled above, so skip here
> Return state_input_port_dicts with FUNCTION entries added as appropriate.</p>

...

See CI logs for the full diff.

@coveralls
Copy link

coveralls commented Feb 4, 2022

Coverage Status

Coverage increased (+0.001%) to 84.567% when pulling b4f0fd4 on test/ocm/state_feat_fct_dict into 1b23904 on devel.

@jdcpni jdcpni merged commit a8927fa into devel Feb 4, 2022
@jdcpni jdcpni deleted the test/ocm/state_feat_fct_dict branch February 4, 2022 03:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants