Code

Feat/ocm/random params#2231

Code

Merged

jdcpni merged 248 commits intodevelPrincetonUniversity/PsyNeuLink:develfrom feat/ocm/random_paramsPrincetonUniversity/PsyNeuLink:feat/ocm/random_paramsCopy head branch name to clipboardDec 9, 2021

+238-172

Commits

Commits on Apr 30, 2021

• • component.py

  Show description for 064d63f
  jdcpni

  committed
  064d63f

  Copy full SHA for 064d63f

• Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeuLink into devel

  jdcpni

  committed
  614a53a

  Copy full SHA for 614a53a

• Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeuLink into devel

  jdcpni

  committed
  a32f213

  Copy full SHA for a32f213

Commits on May 5, 2021

• Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeuLink into devel

  jdcpni

  committed
  75cf069

  Copy full SHA for 75cf069

Commits on Jul 8, 2021

• Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeuLink into devel

  jdcpni

  committed
  dff1a37

  Copy full SHA for dff1a37

Commits on Oct 23, 2021

• Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeuLink into devel

  jdcpni

  committed
  cd5e38e

  Copy full SHA for cd5e38e

Commits on Oct 30, 2021

• Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeuLink into devel

  jdcpni

  committed
  9361857

  Copy full SHA for 9361857

Commits on Nov 4, 2021

• Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeuLink into devel

  jdcpni

  committed
  0129ff7

  Copy full SHA for 0129ff7

• Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeuLink into devel

  jdcpni

  committed
  bbd20f5

  Copy full SHA for bbd20f5

Commits on Nov 7, 2021

• Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeuLink into devel

  jdcpni

  committed
  f9aba91

  Copy full SHA for f9aba91

• • optimizationcontrolmechanism.py:

  Show description for a3c0f6c
  jdcpni

  committed
  a3c0f6c

  Copy full SHA for a3c0f6c

• • optimizationcontrolmechanism.py:

  Show description for 7069b3a
  jdcpni

  committed
  7069b3a

  Copy full SHA for 7069b3a

• • optimizationcontrolmechanism.py:

  Show description for 65b960e
  jdcpni

  committed
  65b960e

  Copy full SHA for 65b960e

Commits on Nov 8, 2021

• Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeuLink into feat/ocm/feature_input_ports

  jdcpni

  committed
  5cc58f6

  Copy full SHA for 5cc58f6

• Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeuLink into devel

  jdcpni

  committed
  bc05b51

  Copy full SHA for bc05b51

• - modified test_mode_based_num_estimates

  jdcpni

  committed
  a8d428b

  Copy full SHA for a8d428b

• -

  jdcpni

  committed
  1218b6f

  Copy full SHA for 1218b6f

• -

  jdcpni

  committed
  41567bb

  Copy full SHA for 41567bb

• Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeuLink into feat/ocm/feature_input_ports

  jdcpni

  committed
  b65650f

  Copy full SHA for b65650f

Commits on Nov 9, 2021

• • optimizationcontrolmechanism.py:

  Show description for 822742f
  jdcpni

  committed
  822742f

  Copy full SHA for 822742f

• • composition.py

  Show description for 5a3efba
  jdcpni

  committed
  5a3efba

  Copy full SHA for 5a3efba

• • composition.py:

  Show description for 7acdebd
  jdcpni

  committed
  7acdebd

  Copy full SHA for 7acdebd

• -

  jdcpni

  committed
  f81baf5

  Copy full SHA for f81baf5

• • composition.py

  Show description for cc1e98e
  jdcpni

  committed
  cc1e98e

  Copy full SHA for cc1e98e

Commits on Nov 10, 2021

• • composition.py:

  Show description for a00b95f
  jdcpni

  committed
  a00b95f

  Copy full SHA for a00b95f

• -

  jdcpni

  committed
  ed0a720

  Copy full SHA for ed0a720

• • optimizationcontrolmechanism.py:

  Show description for cb0b930
  jdcpni

  committed
  cb0b930

  Copy full SHA for cb0b930

• -

  jdcpni

  committed
  8cadf24

  Copy full SHA for 8cadf24

• • optimizationcontrolmechanism.py:

  Show description for 1cc216e
  jdcpni

  committed
  1cc216e

  Copy full SHA for 1cc216e

• -

  jdcpni

  committed
  ba278c1

  Copy full SHA for ba278c1

• -

  jdcpni

  committed
  b5f1c66

  Copy full SHA for b5f1c66

• Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeuLink into devel

  jdcpni

  committed
  0e38f1b

  Copy full SHA for 0e38f1b

• • optimizationcontrolmechanism.py

  Show description for b4a9b82
  jdcpni

  committed
  b4a9b82

  Copy full SHA for b4a9b82

• -

  

  jdcpni

  committed
  2050118

  Copy full SHA for 2050118

Commits on Nov 11, 2021

• • optimizationcontrolmechanism.py

  Show description for b925dab
  jdcpni

  committed
  b925dab

  Copy full SHA for b925dab

• Merge branch 'refactor/ocm/state_input_ports' of https://github.com/PrincetonUniversity/PsyNeuLink into refactor/ocm/state_input_ports

  Show description for bdb12fb
  jdcpni

  committed
  bdb12fb

  Copy full SHA for bdb12fb

• • optimizationcontrolmechanism.py

  Show description for c1b3000
  jdcpni

  committed
  c1b3000

  Copy full SHA for c1b3000

• -

  jdcpni

  committed
  7ca8a0b

  Copy full SHA for 7ca8a0b

• -

  jdcpni

  committed
  d1010fd

  Copy full SHA for d1010fd

• Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeuLink into refactor/ocm/state_input_ports

  jdcpni

  committed
  e57cd2d

  Copy full SHA for e57cd2d

• Merge branch 'fix/ocm/llvm_num_estimates' into refactor/ocm/state_input_ports

  Show description for 0ff99ec
  jdcpni

  committed
  0ff99ec

  Copy full SHA for 0ff99ec

• -

  jdcpni

  committed
  3607a9a

  Copy full SHA for 3607a9a

• -

  jdcpni

  committed
  6017b7b

  Copy full SHA for 6017b7b

• • composition.py

  Show description for 2395f7e
  jdcpni

  committed
  2395f7e

  Copy full SHA for 2395f7e

• • composition.py

  Show description for f317567
  jdcpni

  committed
  f317567

  Copy full SHA for f317567

• llvm/struct generation: Make sure num_estimats per trial is always integer

  Show description for 8edacf6
  jvesely

  committed
  8edacf6

  Copy full SHA for 8edacf6

• -

  jdcpni

  committed
  8ed5e87

  Copy full SHA for 8ed5e87

• Merge branch 'fix/ocm/llvm_num_estimates' into refactor/ocm/state_input_ports

  Show description for bcfbae9
  jdcpni

  committed
  bcfbae9

  Copy full SHA for bcfbae9

• Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeuLink into refactor/ocm/state_input_ports

  jdcpni

  committed
  8a564aa

  Copy full SHA for 8a564aa

Commits on Nov 12, 2021

• • composition.py:

  Show description for 883b49d
  jdcpni

  committed
  883b49d

  Copy full SHA for 883b49d

• -

  jdcpni

  committed
  d2faa86

  Copy full SHA for d2faa86

• • composition.py

  Show description for a632f72
  jdcpni

  committed
  a632f72

  Copy full SHA for a632f72

• • test_control.py

  Show description for 0e1a32e
  jdcpni

  committed
  0e1a32e

  Copy full SHA for 0e1a32e

• Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeuLink into refactor/ocm/state_input_ports

  Show description for 1d996fb
  jdcpni

  committed
  1d996fb

  Copy full SHA for 1d996fb

• Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeuLink into devel

  jdcpni

  committed
  cbe6d24

  Copy full SHA for cbe6d24

• • optimizationfunctions.py:

  Show description for 3856bdd
  jdcpni

  committed
  3856bdd

  Copy full SHA for 3856bdd

• Merge branch 'refactor/ocm/state_input_ports' of https://github.com/PrincetonUniversity/PsyNeuLink into refactor/ocm/state_input_ports

  Show description for 0eb6514
  jdcpni

  committed
  0eb6514

  Copy full SHA for 0eb6514

Commits on Nov 13, 2021

• -

  jdcpni

  committed
  4b2fe4a

  Copy full SHA for 4b2fe4a

• • composition.py

  Show description for d580849
  jdcpni

  committed
  d580849

  Copy full SHA for d580849

Commits on Nov 15, 2021

• -

  jdcpni

  committed
  79b6ed6

  Copy full SHA for 79b6ed6

• Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeuLink into refactor/ocm/state_input_ports

  jdcpni

  committed
  1a5dd50

  Copy full SHA for 1a5dd50

• • composition.py:

  Show description for 34b179e
  jdcpni

  committed
  34b179e

  Copy full SHA for 34b179e

• -

  

  jdcpni

  committed
  3757e2f

  Copy full SHA for 3757e2f

Commits on Nov 16, 2021

• • composition.py:

  Show description for dff750a
  jdcpni

  committed
  dff750a

  Copy full SHA for dff750a

• Merge branch 'refactor/ocm/state_input_ports' of https://github.com/PrincetonUniversity/PsyNeuLink into refactor/ocm/state_input_ports

  jdcpni

  committed
  38e5bae

  Copy full SHA for 38e5bae

• • composition.py

  Show description for d487a4c
  jdcpni

  committed
  d487a4c

  Copy full SHA for d487a4c

• -

  jdcpni

  committed
  779add6

  Copy full SHA for 779add6

Commits on Nov 17, 2021

• • composition.py:

  Show description for 5c361e2
  jdcpni

  committed
  5c361e2

  Copy full SHA for 5c361e2

• -

  jdcpni

  committed
  0c2de6a

  Copy full SHA for 0c2de6a

• Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeuLink into devel

  jdcpni

  committed
  a7436db

  Copy full SHA for a7436db

• -

  jdcpni

  committed
  27b2d76

  Copy full SHA for 27b2d76

• -

  jdcpni

  committed
  0981388

  Copy full SHA for 0981388

• -

  jdcpni

  committed
  698d824

  Copy full SHA for 698d824

• -

  jdcpni

  committed
  900da17

  Copy full SHA for 900da17

• -

  jdcpni

  committed
  aa5a431

  Copy full SHA for aa5a431

• -

  jdcpni

  committed
  780be92

  Copy full SHA for 780be92

• Merge branch 'refactor/ocm/state_input_ports' of https://github.com/PrincetonUniversity/PsyNeuLink into refactor/ocm/state_input_ports

  jdcpni

  committed
  fa4e038

  Copy full SHA for fa4e038

• -

  jdcpni

  committed
  af135d6

  Copy full SHA for af135d6

• • Passing all test_control tests except test_mode_based_num_estimates

  jdcpni

  committed
  f13747a

  Copy full SHA for f13747a

• • Passing all test_control tests

  jdcpni

  committed
  eff7005

  Copy full SHA for eff7005

• -

  jdcpni

  committed
  ea1465e

  Copy full SHA for ea1465e

Commits on Nov 18, 2021

• • optimizationcontrolmechanism.py

  Show description for 1c39268
  jdcpni

  committed
  1c39268

  Copy full SHA for 1c39268

• -

  jdcpni

  committed
  a7f7cf4

  Copy full SHA for a7f7cf4

• • optimizationcontrolmechanism.py

  Show description for 7a6b5a7
  jdcpni

  committed
  7a6b5a7

  Copy full SHA for 7a6b5a7

• • test_show_graph.py: passes all tests

  jdcpni

  committed
  11cf225

  Copy full SHA for 11cf225

• -

  jdcpni

  committed
  72b922a

  Copy full SHA for 72b922a

• • test_report.py: passing all tests

  

  jdcpni

  committed
  b6e697e

  Copy full SHA for b6e697e

• • Passes all tests!

  

  jdcpni

  committed
  1609acc

  Copy full SHA for 1609acc

Commits on Nov 19, 2021

• -

  jdcpni

  committed
  b889604

  Copy full SHA for b889604

• Merge branch 'refactor/ocm/state_input_ports' of https://github.com/PrincetonUniversity/PsyNeuLink into refactor/ocm/state_input_ports

  jdcpni

  committed
  c4b081e

  Copy full SHA for c4b081e

• -

  

  jdcpni

  committed
  47a757a

  Copy full SHA for 47a757a

• Merge branch 'refactor/ocm/state_input_ports' of https://github.com/PrincetonUniversity/PsyNeuLink into refactor/ocm/state_input_ports

  jdcpni

  committed
  78f4ec6

  Copy full SHA for 78f4ec6

• • composition.py: reorganize with #region and #enregions

  jdcpni

  committed
  faaf256

  Copy full SHA for faaf256

• • composition.py: reorganize with #region and #enregions

  jdcpni

  committed
  fb9c424

  Copy full SHA for fb9c424

• • controlmechanism.py, optimizationcontrolmechanism.py:

  Show description for 0c96840
  jdcpni

  committed
  0c96840

  Copy full SHA for 0c96840

• -

  jdcpni

  committed
  d40082c

  Copy full SHA for d40082c

• -

  jdcpni

  committed
  1630f87

  Copy full SHA for 1630f87

• -

  jdcpni

  committed
  a76a2d0

  Copy full SHA for a76a2d0

• • controlmechanism.py, optimizationcontrolmechanism.py:

  Show description for b1f9778
  jdcpni

  committed
  b1f9778

  Copy full SHA for b1f9778

• • controlmechanism.py, optimizationcontrolmechanism.py:

  Show description for 451abb3
  jdcpni

  committed
  451abb3

  Copy full SHA for 451abb3

Commits on Nov 20, 2021

• -

  jdcpni

  committed
  304174e

  Copy full SHA for 304174e

• • composition.py:

  Show description for 428eed8
  

  jdcpni

  committed
  428eed8

  Copy full SHA for 428eed8

• -

  jdcpni

  committed
  5c71808

  Copy full SHA for 5c71808

• - test_control: only test_hanging_control_spec_outer_controller not passing

  jdcpni

  committed
  3733ea9

  Copy full SHA for 3733ea9

• -

  

  jdcpni

  committed
  5851949

  Copy full SHA for 5851949

• -

  

  jdcpni

  committed
  e8909b7

  Copy full SHA for e8909b7

• -

  

  jdcpni

  committed
  2018260

  Copy full SHA for 2018260

• -

  jdcpni

  committed
  98be7a0

  Copy full SHA for 98be7a0

• -

  jdcpni

  committed
  636b7c7

  Copy full SHA for 636b7c7

• -

  jdcpni

  committed
  f3a857a

  Copy full SHA for f3a857a

• • composition.py:

  Show description for 2552f73
  jdcpni

  committed
  2552f73

  Copy full SHA for 2552f73

• • test_paremtercomposition.py:

  Show description for c02735e
  jdcpni

  committed
  c02735e

  Copy full SHA for c02735e

Commits on Nov 21, 2021

• ª Attempt to fix problem with partially overlapping local and ocm control specs

  Show description for 8568b47
  jdcpni

  committed
  8568b47

  Copy full SHA for 8568b47

• see later commit

  jdcpni

  committed
  1aadd6d

  Copy full SHA for 1aadd6d

• see later commit

  jdcpni

  committed
  da80ad6

  Copy full SHA for da80ad6

• see later commit

  jdcpni

  committed
  fa1683f

  Copy full SHA for fa1683f

• see later commit

  jdcpni

  committed
  8dee921

  Copy full SHA for 8dee921

• - This branch passes all tests except:

  Show description for d17b5cd
  jdcpni

  committed
  d17b5cd

  Copy full SHA for d17b5cd

• - small mods; don't impact anything relevant to prior commit message

  jdcpni

  committed
  2503dfc

  Copy full SHA for 2503dfc

• - small mods; don't impact anything relevant to prior commit message

  jdcpni

  committed
  6cf4609

  Copy full SHA for 6cf4609

• - small mods; don't impact anything relevant to prior commit message

  jdcpni

  committed
  cdb6399

  Copy full SHA for cdb6399

• - finished adding formatting regions to composition.py

  jdcpni

  committed
  5cf0bc2

  Copy full SHA for 5cf0bc2

• -

  jdcpni

  committed
  46ccc47

  Copy full SHA for 46ccc47

• • composition.py:

  Show description for 2b3b857
  jdcpni

  committed
  2b3b857

  Copy full SHA for 2b3b857

Commits on Nov 22, 2021

• • show_graph.py: addressed bug associated with ocm.allow_direct_probe

  jdcpni

  committed
  bd5cd10

  Copy full SHA for bd5cd10

• • show_graph.py: addressed bug associated with ocm.allow_direct_probe

  jdcpni

  committed
  6d894a7

  Copy full SHA for 6d894a7

• -

  jdcpni

  committed
  689d7b6

  Copy full SHA for 689d7b6

Commits on Nov 23, 2021

• Composition: add_controller: set METHOD as context source early

  kmantel

  committed
  bcddef5

  Copy full SHA for bcddef5

• -

  jdcpni

  committed
  7fd49c6

  Copy full SHA for 7fd49c6

• Merge branch 'refactor/ocm/state_input_ports_PROBE_FIX' of https://github.com/PrincetonUniversity/PsyNeuLink into refactor/ocm/state_input_ports_PROBE_FIX

  jdcpni

  committed
  35c97d3

  Copy full SHA for 35c97d3

Commits on Nov 24, 2021

• • composition.py

  Show description for 79cb012
  jdcpni

  committed
  79cb012

  Copy full SHA for 79cb012

• • composition.py

  Show description for 9bc7b18
  jdcpni

  committed
  9bc7b18

  Copy full SHA for 9bc7b18

Commits on Nov 25, 2021

• • test_partially_overlapping_local_and_control_mech_control_specs_in_unnested_and_nested_comp():

  Show description for 0f93f47
  

  jdcpni

  committed
  0f93f47

  Copy full SHA for 0f93f47

• Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeuLink into devel

  jdcpni

  committed
  47b56b2

  Copy full SHA for 47b56b2

• • composition.py

  Show description for 81f1112
  jdcpni

  committed
  81f1112

  Copy full SHA for 81f1112

• • composition.py

  Show description for 0cd9db3
  jdcpni

  committed
  0cd9db3

  Copy full SHA for 0cd9db3

• • composition.py

  Show description for c808664
  jdcpni

  committed
  c808664

  Copy full SHA for c808664

• -

  jdcpni

  committed
  0cb21ab

  Copy full SHA for 0cb21ab

• - confirm that it passes all tests exception test_composition/test_partially_overlapping...

  Show description for 28289a0
  

  jdcpni

  committed
  28289a0

  Copy full SHA for 28289a0

• • composition.py: some more fixed to add_controller that now fail only one test:

  Show description for 1cf9602
  jdcpni

  committed
  1cf9602

  Copy full SHA for 1cf9602

• • Passes *all* current tests

  jdcpni

  committed
  72c4c41

  Copy full SHA for 72c4c41

• • composition.py:

  Show description for 45b25eb
  

  jdcpni

  committed
  45b25eb

  Copy full SHA for 45b25eb

• -

  

  jdcpni

  committed
  a79723b

  Copy full SHA for a79723b

Commits on Nov 26, 2021

• -

  jdcpni

  committed
  49350a1

  Copy full SHA for 49350a1

• Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeuLink into devel

  jdcpni

  committed
  f7b9fc5

  Copy full SHA for f7b9fc5

• -

  jdcpni

  committed
  7a6682a

  Copy full SHA for 7a6682a

• Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeuLink into devel

  

  jdcpni

  committed
  ef87ca1

  Copy full SHA for ef87ca1

• • controlmechanism.py:

  Show description for 8858ab5
  jdcpni

  committed
  8858ab5

  Copy full SHA for 8858ab5

• -

  jdcpni

  committed
  d1ac2da

  Copy full SHA for d1ac2da

Commits on Nov 27, 2021

• • composition.py: in progress fix of bug in instantiating shadow projections for ocm.state_input_ports

  jdcpni

  committed
  dbdc2d1

  Copy full SHA for dbdc2d1

• • composition.py:

  Show description for 6b00fbd
  jdcpni

  committed
  6b00fbd

  Copy full SHA for 6b00fbd

• • optimizationcontrolmechanism.py

  Show description for 179e7d0
  jdcpni

  committed
  179e7d0

  Copy full SHA for 179e7d0

• -

  jdcpni

  committed
  88ce1a6

  Copy full SHA for 88ce1a6

• • composition.py

  Show description for 5089cf3
  jdcpni

  committed
  5089cf3

  Copy full SHA for 5089cf3

• • test_show_graph.py: update for fixes

  

  jdcpni

  committed
  97a71c4

  Copy full SHA for 97a71c4

• -

  

  jdcpni

  committed
  3bc799e

  Copy full SHA for 3bc799e

• • tests: passes all in test_show_graph.py and test_report.py

  

  jdcpni

  committed
  6a27e4a

  Copy full SHA for 6a27e4a

• Passes all tests

  

  jdcpni

  committed
  8cdad10

  Copy full SHA for 8cdad10

• - comment clean-up

  

  jdcpni

  committed
  2d15f6d

  Copy full SHA for 2d15f6d

• • composition.py

  Show description for 787856b
  jdcpni

  committed
  787856b

  Copy full SHA for 787856b

Commits on Nov 28, 2021

• • composition.py, optimizationcontrolmechanism.py:

  Show description for 3ed598e
  

  jdcpni

  committed
  3ed598e

  Copy full SHA for 3ed598e

• • show_graph.py: fixed bug causing extra projections to OCM

  jdcpni

  committed
  38e5f99

  Copy full SHA for 38e5f99

• • composition.py:

  Show description for 658c161
  jdcpni

  committed
  658c161

  Copy full SHA for 658c161

• Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeuLink into refactor/ocm/state_input_ports_PROBE

  jdcpni

  committed
  7396806

  Copy full SHA for 7396806

• • optimizationcontrolmechanism.py: add agent_rep_type property

  jdcpni

  committed
  8b54f03

  Copy full SHA for 8b54f03

• • optimizationcontrolmechanism.py:

  Show description for 1ecf0fa
  jdcpni

  committed
  1ecf0fa

  Copy full SHA for 1ecf0fa

Commits on Nov 29, 2021

• • optimizationcontrolmechanism.py:

  Show description for 24a03f3
  jdcpni

  committed
  24a03f3

  Copy full SHA for 24a03f3

• -

  jdcpni

  committed
  6713df9

  Copy full SHA for 6713df9

• -

  jdcpni

  committed
  8b3bdf0

  Copy full SHA for 8b3bdf0

• • Passes all tests except test_json with 'model_with_control'

  jdcpni

  committed
  d001991

  Copy full SHA for d001991

Commits on Nov 30, 2021

• -

  jdcpni

  committed
  888863a

  Copy full SHA for 888863a

• • composition.py

  Show description for 6fb5cf6
  jdcpni

  committed
  6fb5cf6

  Copy full SHA for 6fb5cf6

• • composition.py

  Show description for c1fd334
  jdcpni

  committed
  c1fd334

  Copy full SHA for c1fd334

• • composition.py

  Show description for 00e7da9
  jdcpni

  committed
  00e7da9

  Copy full SHA for 00e7da9

• -

  jdcpni

  committed
  77ae108

  Copy full SHA for 77ae108

• • test_two_origins_two_input_ports: crashes on failure of C->B to update

  jdcpni

  committed
  774f6b3

  Copy full SHA for 774f6b3

• -

  jdcpni

  committed
  c4fedbe

  Copy full SHA for c4fedbe

Commits on Dec 1, 2021

• • composition.py

  Show description for e29f618
  

  jdcpni

  committed
  e29f618

  Copy full SHA for e29f618

• • optimizationcontrolmechanism.py

  Show description for d551e9d
  jdcpni

  committed
  d551e9d

  Copy full SHA for d551e9d

• • optimizationcontrolmechanism.py

  Show description for 66c05f7
  jdcpni

  committed
  66c05f7

  Copy full SHA for 66c05f7

• • composition.py

  Show description for a401857
  jdcpni

  committed
  a401857

  Copy full SHA for a401857

• • composition.py

  Show description for a91695e
  jdcpni

  committed
  a91695e

  Copy full SHA for a91695e

• Port: _remove_projection_to_port: don't reduce variable below length 1

  Show description for 48012a3
  kmantel

  committed
  48012a3

  Copy full SHA for 48012a3

• • composition.py

  Show description for cb828c8
  jdcpni

  committed
  cb828c8

  Copy full SHA for cb828c8

Commits on Dec 2, 2021

• • show_graph.py

  Show description for c6853b6
  jdcpni

  committed
  c6853b6

  Copy full SHA for c6853b6

• • composition.py:

  Show description for d11e117
  jdcpni

  committed
  d11e117

  Copy full SHA for d11e117

• • show_graph.py

  Show description for 756c076
  jdcpni

  committed
  756c076

  Copy full SHA for 756c076

• • composition.py

  Show description for f9924f3
  jdcpni

  committed
  f9924f3

  Copy full SHA for f9924f3

• • composition.py

  Show description for 944d214
  jdcpni

  committed
  944d214

  Copy full SHA for 944d214

• • composition.py:

  Show description for 546378b
  jdcpni

  committed
  546378b

  Copy full SHA for 546378b

• Merge branch 'refactor/ocm/state_input_ports_PROBE_STATE_FEAT_FCT' of https://github.com/PrincetonUniversity/PsyNeuLink into refactor/ocm/state_input_ports_PROBE_STATE_FEAT_FCT

  jdcpni

  committed
  67dd8c7

  Copy full SHA for 67dd8c7

• • show_graph.py

  Show description for 7de2c62
  jdcpni

  committed
  7de2c62

  Copy full SHA for 7de2c62

• Merge branch 'refactor/ocm/state_input_ports_PROBE_STATE_FEAT_FCT' of https://github.com/PrincetonUniversity/PsyNeuLink into refactor/ocm/state_input_ports_PROBE_STATE_FEAT_FCT

  jdcpni

  committed
  d4ee355

  Copy full SHA for d4ee355

• -

  jdcpni

  committed
  be76389

  Copy full SHA for be76389

• • composition.py

  Show description for 399d1f7
  jdcpni

  committed
  399d1f7

  Copy full SHA for 399d1f7

• -

  jdcpni

  committed
  bc47b76

  Copy full SHA for bc47b76

• -

  jdcpni

  committed
  4afdf0a

  Copy full SHA for 4afdf0a

• • test_composition.py

  Show description for 7423d37
  jdcpni

  committed
  7423d37

  Copy full SHA for 7423d37

• Merge branch 'refactor/ocm/state_input_ports_PROBE_STATE_FEAT_FCT' of https://github.com/PrincetonUniversity/PsyNeuLink into refactor/ocm/state_input_ports_PROBE_STATE_FEAT_FCT

  Show description for 4134cde
  jdcpni

  committed
  4134cde

  Copy full SHA for 4134cde

• Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeuLink into refactor/ocm/state_input_ports_PROBE_STATE_FEAT_FCT

  Show description for de80376
  jdcpni

  committed
  de80376

  Copy full SHA for de80376

• -

  jdcpni

  committed
  4e63090

  Copy full SHA for 4e63090

Commits on Dec 3, 2021

• -

  jdcpni

  committed
  552fc04

  Copy full SHA for 552fc04

• -

  jdcpni

  committed
  24a7340

  Copy full SHA for 24a7340

• -

  jdcpni

  committed
  1cca7d6

  Copy full SHA for 1cca7d6

• Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeuLink into refactor/ocm/state_input_ports

  jdcpni

  committed
  9d07c46

  Copy full SHA for 9d07c46

• • optimizationcontrolmechanism.py: docstring mods

  jdcpni

  committed
  a9ff72c

  Copy full SHA for a9ff72c

• Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeuLink into devel

  jdcpni

  committed
  91a4fbe

  Copy full SHA for 91a4fbe

• Merge branch 'refactor/ocm/state_input_ports' into devel

  jdcpni

  committed
  eed7e89

  Copy full SHA for eed7e89

Commits on Dec 5, 2021

• Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeuLink into devel

  Show description for 6d3dfa7
  jdcpni

  committed
  6d3dfa7

  Copy full SHA for 6d3dfa7

• Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeuLink into devel

  Show description for ad673e5
  

  jdcpni

  committed
  ad673e5

  Copy full SHA for ad673e5

Commits on Dec 6, 2021

• -

  

  jdcpni

  committed
  e30a4fc

  Copy full SHA for e30a4fc

• Merge branch 'docs/ocm/revs' of https://github.com/PrincetonUniversity/PsyNeuLink into docs/ocm

  

  jdcpni

  committed
  112ac3d

  Copy full SHA for 112ac3d

• -

  jdcpni

  committed
  785bc3c

  Copy full SHA for 785bc3c

• Merge branch 'docs/ocm_new' of https://github.com/PrincetonUniversity/PsyNeuLink into docs/ocm/revs

  jdcpni

  committed
  f7372b0

  Copy full SHA for f7372b0

• • optimizationcontrolmechanism.py

  Show description for cc6da90
  jdcpni

  committed
  cc6da90

  Copy full SHA for cc6da90

• • optimizationcontrolmechanism.py

  Show description for d46dad4
  jdcpni

  committed
  d46dad4

  Copy full SHA for d46dad4

• -

  jdcpni

  committed
  41e2b31

  Copy full SHA for 41e2b31

• -

  jdcpni

  committed
  c5c70f6

  Copy full SHA for c5c70f6

• -

  jdcpni

  committed
  7ea579d

  Copy full SHA for 7ea579d

• Merge branch 'docs/ocm/revs' of https://github.com/PrincetonUniversity/PsyNeuLink into docs/ocm/revs

  jdcpni

  committed
  633f939

  Copy full SHA for 633f939

• -

  jdcpni

  committed
  494e250

  Copy full SHA for 494e250

• -

  jdcpni

  committed
  1129123

  Copy full SHA for 1129123

• -

  jdcpni

  committed
  12f8bec

  Copy full SHA for 12f8bec

Commits on Dec 7, 2021

• -

  jdcpni

  committed
  09cb615

  Copy full SHA for 09cb615

• -

  jdcpni

  committed
  c6f3dcf

  Copy full SHA for c6f3dcf

• Merge branch 'devel' into docs/ocm/revs

  jdcpni

  authored
  956c4ce

  Copy full SHA for 956c4ce

• Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeuLink into docs/ocm/revs

  jdcpni

  committed
  f26bd5c

  Copy full SHA for f26bd5c

• -

  jdcpni

  committed
  e025314

  Copy full SHA for e025314

• Merge branch 'docs/ocm/revs' of https://github.com/PrincetonUniversity/PsyNeuLink into docs/ocm/revs

  jdcpni

  committed
  26c33dc

  Copy full SHA for 26c33dc

• Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeuLink into docs/ocm/revs

  Show description for 03ce8ee
  jdcpni

  committed
  03ce8ee

  Copy full SHA for 03ce8ee

• • optimizationcontrolmechanism.py - more docstring edits

  jdcpni

  committed
  17ade6d

  Copy full SHA for 17ade6d

• Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeuLink into docs/ocm/revs

  jdcpni

  committed
  02fbf12

  Copy full SHA for 02fbf12

• • optimizationcontrolmechanism.py - more docstring edits

  jdcpni

  committed
  d2cd4ca

  Copy full SHA for d2cd4ca

• -

  jdcpni

  committed
  260d490

  Copy full SHA for 260d490

• -

  jdcpni

  committed
  d28443f

  Copy full SHA for d28443f

• -

  jdcpni

  committed
  e9dbfef

  Copy full SHA for e9dbfef

• -

  jdcpni

  committed
  e9a8fbd

  Copy full SHA for e9a8fbd

• -

  jdcpni

  committed
  1a4b63d

  Copy full SHA for 1a4b63d

• Merge branch 'docs/ocm/revs' of https://github.com/PrincetonUniversity/PsyNeuLink into docs/ocm/revs

  Show description for d2a8eda
  jdcpni

  committed
  d2a8eda

  Copy full SHA for d2a8eda

Commits on Dec 8, 2021

• -

  jdcpni

  committed
  e5143e7

  Copy full SHA for e5143e7

• • optimizationcontrolmechanism.py: add random_params

  jdcpni

  committed
  ee77e7f

  Copy full SHA for ee77e7f

• -

  jdcpni

  committed
  f46eaaa

  Copy full SHA for f46eaaa

• -

  jdcpni

  committed
  6654cb0

  Copy full SHA for 6654cb0

• Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeuLink into feat/ocm/random_params

  jdcpni

  committed
  afc8cc1

  Copy full SHA for afc8cc1

• -

  jdcpni

  committed
  368dac4

  Copy full SHA for 368dac4

• -

  jdcpni

  committed
  590c9f2

  Copy full SHA for 590c9f2

Commits on Dec 9, 2021

• • composition.py

  Show description for b8d32a2
  jdcpni

  committed
  b8d32a2

  Copy full SHA for b8d32a2

• -

  jdcpni

  committed
  2431b9c

  Copy full SHA for 2431b9c