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

Feat/comp/get input format #2315

Merged
merged 296 commits into from
Feb 10, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
296 commits
Select commit Hold shift + click to select a range
8ed5e87
-
jdcpni Nov 11, 2021
bcfbae9
Merge branch 'fix/ocm/llvm_num_estimates' into refactor/ocm/state_inp…
jdcpni Nov 11, 2021
8a564aa
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Nov 11, 2021
883b49d
• composition.py:
jdcpni Nov 12, 2021
d2faa86
-
jdcpni Nov 12, 2021
a632f72
• composition.py
jdcpni Nov 12, 2021
0e1a32e
• test_control.py
jdcpni Nov 12, 2021
1d996fb
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Nov 12, 2021
cbe6d24
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Nov 12, 2021
3856bdd
• optimizationfunctions.py:
jdcpni Nov 12, 2021
0eb6514
Merge branch 'refactor/ocm/state_input_ports' of https://github.com/P…
jdcpni Nov 12, 2021
4b2fe4a
-
jdcpni Nov 13, 2021
d580849
• composition.py
jdcpni Nov 13, 2021
79b6ed6
-
jdcpni Nov 15, 2021
1a5dd50
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Nov 15, 2021
34b179e
• composition.py:
jdcpni Nov 15, 2021
dff750a
• composition.py:
jdcpni Nov 16, 2021
38e5bae
Merge branch 'refactor/ocm/state_input_ports' of https://github.com/P…
jdcpni Nov 16, 2021
d487a4c
• composition.py
jdcpni Nov 16, 2021
779add6
-
jdcpni Nov 16, 2021
5c361e2
• composition.py:
jdcpni Nov 17, 2021
0c2de6a
-
jdcpni Nov 17, 2021
a7436db
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Nov 17, 2021
27b2d76
-
jdcpni Nov 17, 2021
0981388
-
jdcpni Nov 17, 2021
698d824
-
jdcpni Nov 17, 2021
900da17
-
jdcpni Nov 17, 2021
aa5a431
-
jdcpni Nov 17, 2021
780be92
-
jdcpni Nov 17, 2021
fa4e038
Merge branch 'refactor/ocm/state_input_ports' of https://github.com/P…
jdcpni Nov 17, 2021
af135d6
-
jdcpni Nov 17, 2021
f13747a
• Passing all test_control tests except test_mode_based_num_estimates
jdcpni Nov 17, 2021
eff7005
• Passing all test_control tests
jdcpni Nov 17, 2021
ea1465e
-
jdcpni Nov 17, 2021
1c39268
• optimizationcontrolmechanism.py
jdcpni Nov 18, 2021
a7f7cf4
-
jdcpni Nov 18, 2021
7a6b5a7
• optimizationcontrolmechanism.py
jdcpni Nov 18, 2021
11cf225
• test_show_graph.py: passes all tests
jdcpni Nov 18, 2021
72b922a
-
jdcpni Nov 18, 2021
b6e697e
• test_report.py: passing all tests
Nov 18, 2021
1609acc
• Passes all tests!
Nov 18, 2021
b889604
-
jdcpni Nov 19, 2021
c4b081e
Merge branch 'refactor/ocm/state_input_ports' of https://github.com/P…
jdcpni Nov 19, 2021
47a757a
-
Nov 19, 2021
78f4ec6
Merge branch 'refactor/ocm/state_input_ports' of https://github.com/P…
jdcpni Nov 19, 2021
faaf256
• composition.py: reorganize with #region and #enregions
jdcpni Nov 19, 2021
fb9c424
• composition.py: reorganize with #region and #enregions
jdcpni Nov 19, 2021
0c96840
• controlmechanism.py, optimizationcontrolmechanism.py:
jdcpni Nov 19, 2021
d40082c
-
jdcpni Nov 19, 2021
1630f87
-
jdcpni Nov 19, 2021
a76a2d0
-
jdcpni Nov 19, 2021
b1f9778
• controlmechanism.py, optimizationcontrolmechanism.py:
jdcpni Nov 19, 2021
451abb3
• controlmechanism.py, optimizationcontrolmechanism.py:
jdcpni Nov 19, 2021
304174e
-
jdcpni Nov 20, 2021
428eed8
• composition.py:
Nov 20, 2021
5c71808
-
jdcpni Nov 20, 2021
3733ea9
- test_control: only test_hanging_control_spec_outer_controller not p…
jdcpni Nov 20, 2021
5851949
-
Nov 20, 2021
e8909b7
-
Nov 20, 2021
2018260
-
Nov 20, 2021
98be7a0
-
jdcpni Nov 20, 2021
636b7c7
-
jdcpni Nov 20, 2021
f3a857a
-
jdcpni Nov 20, 2021
2552f73
• composition.py:
jdcpni Nov 20, 2021
c02735e
• test_paremtercomposition.py:
jdcpni Nov 20, 2021
8568b47
ª Attempt to fix problem with partially overlapping local and ocm con…
jdcpni Nov 21, 2021
1aadd6d
see later commit
jdcpni Nov 21, 2021
da80ad6
see later commit
jdcpni Nov 21, 2021
fa1683f
see later commit
jdcpni Nov 21, 2021
8dee921
see later commit
jdcpni Nov 21, 2021
d17b5cd
- This branch passes all tests except:
jdcpni Nov 21, 2021
2503dfc
- small mods; don't impact anything relevant to prior commit message
jdcpni Nov 21, 2021
6cf4609
- small mods; don't impact anything relevant to prior commit message
jdcpni Nov 21, 2021
cdb6399
- small mods; don't impact anything relevant to prior commit message
jdcpni Nov 21, 2021
5cf0bc2
- finished adding formatting regions to composition.py
jdcpni Nov 21, 2021
46ccc47
-
jdcpni Nov 21, 2021
2b3b857
• composition.py:
jdcpni Nov 21, 2021
bd5cd10
• show_graph.py: addressed bug associated with ocm.allow_direct_probe
jdcpni Nov 22, 2021
6d894a7
• show_graph.py: addressed bug associated with ocm.allow_direct_probe
jdcpni Nov 22, 2021
689d7b6
-
jdcpni Nov 22, 2021
bcddef5
Composition: add_controller: set METHOD as context source early
kmantel Nov 23, 2021
7fd49c6
-
jdcpni Nov 23, 2021
35c97d3
Merge branch 'refactor/ocm/state_input_ports_PROBE_FIX' of https://gi…
jdcpni Nov 23, 2021
79cb012
• composition.py
jdcpni Nov 24, 2021
9bc7b18
• composition.py
jdcpni Nov 24, 2021
0f93f47
• test_partially_overlapping_local_and_control_mech_control_specs_in_…
Nov 25, 2021
47b56b2
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Nov 25, 2021
81f1112
• composition.py
jdcpni Nov 25, 2021
0cd9db3
• composition.py
jdcpni Nov 25, 2021
c808664
• composition.py
jdcpni Nov 25, 2021
0cb21ab
-
jdcpni Nov 25, 2021
28289a0
- confirm that it passes all tests exception test_composition/test_pa…
Nov 25, 2021
1cf9602
• composition.py: some more fixed to add_controller that now fail on…
jdcpni Nov 25, 2021
72c4c41
• Passes *all* current tests
jdcpni Nov 25, 2021
45b25eb
• composition.py:
Nov 25, 2021
a79723b
-
Nov 25, 2021
49350a1
-
jdcpni Nov 26, 2021
f7b9fc5
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Nov 26, 2021
7a6682a
-
jdcpni Nov 26, 2021
8858ab5
• controlmechanism.py:
jdcpni Nov 26, 2021
d1ac2da
-
jdcpni Nov 26, 2021
dbdc2d1
• composition.py: in progress fix of bug in instantiating shadow pro…
jdcpni Nov 27, 2021
6b00fbd
• composition.py:
jdcpni Nov 27, 2021
179e7d0
• optimizationcontrolmechanism.py
jdcpni Nov 27, 2021
88ce1a6
-
jdcpni Nov 27, 2021
5089cf3
• composition.py
jdcpni Nov 27, 2021
97a71c4
• test_show_graph.py: update for fixes
Nov 27, 2021
3bc799e
-
Nov 27, 2021
6a27e4a
• tests: passes all in test_show_graph.py and test_report.py
Nov 27, 2021
8cdad10
Passes all tests
Nov 27, 2021
2d15f6d
- comment clean-up
Nov 27, 2021
787856b
• composition.py
jdcpni Nov 27, 2021
3ed598e
• composition.py, optimizationcontrolmechanism.py:
Nov 28, 2021
38e5f99
• show_graph.py: fixed bug causing extra projections to OCM
jdcpni Nov 28, 2021
658c161
• composition.py:
jdcpni Nov 28, 2021
7396806
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Nov 28, 2021
8b54f03
• optimizationcontrolmechanism.py: add agent_rep_type property
jdcpni Nov 28, 2021
1ecf0fa
• optimizationcontrolmechanism.py:
jdcpni Nov 28, 2021
24a03f3
• optimizationcontrolmechanism.py:
jdcpni Nov 29, 2021
6713df9
-
jdcpni Nov 29, 2021
8b3bdf0
-
jdcpni Nov 29, 2021
d001991
• Passes all tests except test_json with 'model_with_control'
jdcpni Nov 29, 2021
888863a
-
jdcpni Nov 30, 2021
6fb5cf6
• composition.py
jdcpni Nov 30, 2021
c1fd334
• composition.py
jdcpni Nov 30, 2021
00e7da9
• composition.py
jdcpni Nov 30, 2021
77ae108
-
jdcpni Nov 30, 2021
774f6b3
• test_two_origins_two_input_ports: crashes on failure of C->B to up…
jdcpni Nov 30, 2021
c4fedbe
-
jdcpni Nov 30, 2021
e29f618
• composition.py
Dec 1, 2021
d551e9d
• optimizationcontrolmechanism.py
jdcpni Dec 1, 2021
66c05f7
• optimizationcontrolmechanism.py
jdcpni Dec 1, 2021
a401857
• composition.py
jdcpni Dec 1, 2021
a91695e
• composition.py
jdcpni Dec 1, 2021
48012a3
Port: _remove_projection_to_port: don't reduce variable below length 1
kmantel Dec 1, 2021
cb828c8
• composition.py
jdcpni Dec 1, 2021
c6853b6
• show_graph.py
jdcpni Dec 2, 2021
d11e117
• composition.py:
jdcpni Dec 2, 2021
756c076
• show_graph.py
jdcpni Dec 2, 2021
f9924f3
• composition.py
jdcpni Dec 2, 2021
944d214
• composition.py
jdcpni Dec 2, 2021
546378b
• composition.py:
jdcpni Dec 2, 2021
67dd8c7
Merge branch 'refactor/ocm/state_input_ports_PROBE_STATE_FEAT_FCT' of…
jdcpni Dec 2, 2021
7de2c62
• show_graph.py
jdcpni Dec 2, 2021
d4ee355
Merge branch 'refactor/ocm/state_input_ports_PROBE_STATE_FEAT_FCT' of…
jdcpni Dec 2, 2021
be76389
-
jdcpni Dec 2, 2021
399d1f7
• composition.py
jdcpni Dec 2, 2021
bc47b76
-
jdcpni Dec 2, 2021
4afdf0a
-
jdcpni Dec 2, 2021
7423d37
• test_composition.py
jdcpni Dec 2, 2021
4134cde
Merge branch 'refactor/ocm/state_input_ports_PROBE_STATE_FEAT_FCT' of…
jdcpni Dec 2, 2021
de80376
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Dec 2, 2021
4e63090
-
jdcpni Dec 2, 2021
552fc04
-
jdcpni Dec 3, 2021
24a7340
-
jdcpni Dec 3, 2021
1cca7d6
-
jdcpni Dec 3, 2021
9d07c46
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Dec 3, 2021
a9ff72c
• optimizationcontrolmechanism.py: docstring mods
jdcpni Dec 3, 2021
91a4fbe
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Dec 3, 2021
eed7e89
Merge branch 'refactor/ocm/state_input_ports' into devel
jdcpni Dec 3, 2021
6d3dfa7
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Dec 5, 2021
2c20364
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Dec 11, 2021
f050d22
• composition.py:
jdcpni Dec 11, 2021
e574d4f
• composition.py:
jdcpni Dec 11, 2021
a4d6765
• composition.py:
jdcpni Dec 11, 2021
4376f3b
• composition.py:
jdcpni Dec 11, 2021
33efb0f
• composition.py:
jdcpni Dec 11, 2021
99d5847
• controlmechanism.py:
Dec 11, 2021
3153939
• controlmechanism.py:
Dec 11, 2021
27d3571
• composition.py
Dec 11, 2021
99a60f0
• docstring mods
Dec 11, 2021
a16d23c
-
jdcpni Dec 12, 2021
4cfe34a
-
jdcpni Dec 12, 2021
4ba7592
• optimizationcontrolmechanism.py: docstring revs
jdcpni Dec 12, 2021
95be2be
-
jdcpni Dec 12, 2021
6dd5c37
-
jdcpni Dec 12, 2021
7e4afc7
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Dec 12, 2021
028bc03
• test_composition.py:
jdcpni Dec 12, 2021
9faaa46
-
jdcpni Dec 12, 2021
7dfac6d
• composition.py
Dec 12, 2021
6fa1cbc
-
Dec 12, 2021
90b134b
• composition.py:
Dec 12, 2021
eaede0e
-
jdcpni Dec 12, 2021
25c0bdd
Merge branch 'feat/composition/probes' of https://github.com/Princeto…
jdcpni Dec 12, 2021
5dd6dcb
• composition.py:
jdcpni Dec 12, 2021
102acbe
-
jdcpni Dec 13, 2021
2e93dc2
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Dec 13, 2021
c4c6023
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Dec 13, 2021
dd8d944
• CompositionInterfaceMechanism.rst:
jdcpni Dec 13, 2021
b02a3a9
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Dec 26, 2021
a770345
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Dec 28, 2021
7b92ccb
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Jan 2, 2022
b8345ee
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Jan 5, 2022
343ecf8
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Jan 7, 2022
947cc56
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Jan 14, 2022
3f247b3
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Jan 15, 2022
85d0346
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Jan 15, 2022
b7f25d3
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Jan 18, 2022
46ad6c2
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Jan 27, 2022
5193618
• composition.py:
jdcpni Feb 4, 2022
b297b11
-
jdcpni Feb 4, 2022
3762c55
-
jdcpni Feb 4, 2022
02214cc
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Feb 4, 2022
293f38b
• composition.py, mechanism.py:
jdcpni Feb 4, 2022
8f7efd1
-
jdcpni Feb 4, 2022
741d9ef
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Feb 4, 2022
e7ae9da
-
Feb 4, 2022
6200101
• function.py:
Feb 4, 2022
13ec4a7
• mechanism.py:
jdcpni Feb 4, 2022
3437b05
• mechanism.py, inputport.py:
jdcpni Feb 5, 2022
67c2658
-
jdcpni Feb 5, 2022
421a494
-
jdcpni Feb 5, 2022
bc3314e
-
jdcpni Feb 5, 2022
5c9bf06
-
jdcpni Feb 5, 2022
8f67889
-
jdcpni Feb 5, 2022
6b6d222
-
jdcpni Feb 5, 2022
087b513
• mechanism.py:
jdcpni Feb 5, 2022
128ac4f
-
jdcpni Feb 6, 2022
7f5b50a
-
jdcpni Feb 6, 2022
970056f
-
jdcpni Feb 6, 2022
9cd3bb2
-
jdcpni Feb 6, 2022
02da3a9
• Passes all tests
jdcpni Feb 6, 2022
9fe1ab2
• Passes all tests
jdcpni Feb 6, 2022
d9301fc
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Feb 6, 2022
5e673bb
-
jdcpni Feb 6, 2022
5302106
• test_composition.py:
jdcpni Feb 6, 2022
e2b2bb5
- Before adding trials and labels to template to Composition.get_inpu…
jdcpni Feb 7, 2022
7cea79e
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Feb 7, 2022
06acf06
- Before adding trials and labels to template to Composition.get_inpu…
jdcpni Feb 7, 2022
f90feb2
-
jdcpni Feb 7, 2022
012bb05
-
jdcpni Feb 7, 2022
1aa6e8d
-
jdcpni Feb 7, 2022
843db6d
- Before adding trials and labels to template to Composition.get_inpu…
jdcpni Feb 7, 2022
6f283f3
-
Feb 7, 2022
87c419a
- Before adding trials and labels to template to Composition.get_inpu…
jdcpni Feb 7, 2022
cf40d92
- Before adding trials and labels to template to Composition.get_inpu…
jdcpni Feb 7, 2022
14a931f
-
jdcpni Feb 8, 2022
a73792f
-
jdcpni Feb 8, 2022
dcab792
-
jdcpni Feb 8, 2022
b3728f2
-
jdcpni Feb 8, 2022
837f17e
-
jdcpni Feb 8, 2022
81a7bfc
-
jdcpni Feb 8, 2022
ccd69a7
-
jdcpni Feb 8, 2022
ed804e3
-
jdcpni Feb 8, 2022
1791c4d
-
jdcpni Feb 8, 2022
df279ca
-
jdcpni Feb 9, 2022
ceb1a24
-
jdcpni Feb 9, 2022
030a99f
-
jdcpni Feb 9, 2022
5505fd0
• composition.py:
jdcpni Feb 9, 2022
06037aa
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Feb 9, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions psyneulink/core/components/mechanisms/mechanism.py
Original file line number Diff line number Diff line change
Expand Up @@ -3973,7 +3973,7 @@ def output_port(self):

@property
def output_values(self):
return self.output_ports.values
return self.get_output_values()

def get_output_values(self, context=None):
return [output_port.parameters.value.get(context) for output_port in self.output_ports]
Expand All @@ -3993,8 +3993,8 @@ def get_output_labels(self, context=None):
elif context:
return self.get_output_values(context)
else:
return self.output_values

# Use this to report most recent value if no context is available
return self.output_ports.values

@property
def ports(self):
Expand Down
Loading