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

ENH: Add hybrid models for gr and loieau structures #327

Merged

Commits on Jul 19, 2024

  1. Configuration menu
    Copy the full SHA
    b58ec06 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2024

  1. Configuration menu
    Copy the full SHA
    233a8cc View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    90afd60 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2024

  1. Configuration menu
    Copy the full SHA
    c70db0c View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2024

  1. Configuration menu
    Copy the full SHA
    30eb4c5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e4b06e8 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    75a847c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    91bed2f View commit details
    Browse the repository at this point in the history
  5. Fix indent docstring net

    nghi-truyen committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    3d71aec View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    b8dc977 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2024

  1. Configuration menu
    Copy the full SHA
    63a49b7 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2024

  1. Configuration menu
    Copy the full SHA
    b4c5dfc View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ee7824d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0ffd8ad View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    7f5f9ec View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    41a7aa6 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    91429b2 View commit details
    Browse the repository at this point in the history
  7. Merge remote-tracking branch 'upstream/move-optimizers-to-Python' int…

    …o enh-combine-optimizers
    nghi-truyen committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    e1a5a64 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2024

  1. Configuration menu
    Copy the full SHA
    7b5b069 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    268fe5e View commit details
    Browse the repository at this point in the history
  3. Correct comment typo

    nghi-truyen committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    b14c4af View commit details
    Browse the repository at this point in the history
  4. Fix comment

    nghi-truyen committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    3b60a04 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    9fc544b View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    873302c View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    a371562 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    a189bc3 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    a577e2b View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    47bda59 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    d007323 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    834fa73 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    68df6a3 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    71b3148 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    fed6fe7 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2024

  1. Configuration menu
    Copy the full SHA
    d0d2fe3 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2024

  1. Configuration menu
    Copy the full SHA
    4951e29 View commit details
    Browse the repository at this point in the history
  2. Generate baseline

    nghi-truyen committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    016e853 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0d66bb2 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    812a4d2 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    bbc73cf View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2024

  1. Configuration menu
    Copy the full SHA
    4eae8e6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    50b9fd8 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2024

  1. Fix doc net

    nghi-truyen committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    bb207ff View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4133580 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    7af47fd View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    7b297cb View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    c0ff623 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    3221a1d View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    6098461 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2024

  1. Merge branch 'enh-hybrid-models' into enh-net-forward-pass:

    Change hybrid structure name
    nghi-truyen committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    56855c6 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'enh-net-forward-pass' into enh-adaptive-opt-for-all-map…

    …pings:
    
    - Change hybrid structure name
    - Ignore baseline conflicts
    nghi-truyen committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    b2890e1 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'enh-hybrid-models' into enh-net-forward-pass:

    - More flexible NN structure for hybrid models
    - Ignore conflicts on baseline
    nghi-truyen committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    1bce0fc View commit details
    Browse the repository at this point in the history
  4. Merge branch 'enh-net-forward-pass' into enh-adaptive-opt-for-all-map…

    …pings:
    
    - Flexible structure for nn_parameters
    - Ignore baseline conflicts
    nghi-truyen committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    b40ca7a View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    217f05d View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    3cbaacb View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2024

  1. Configuration menu
    Copy the full SHA
    8c6c0f0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    af24e13 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    78c85ce View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    0ed8ecc View commit details
    Browse the repository at this point in the history
  5. Minor fix typos

    nghi-truyen committed Aug 3, 2024
    Configuration menu
    Copy the full SHA
    d0bbb22 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    42cfe15 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    fac74cf View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2024

  1. Configuration menu
    Copy the full SHA
    a04d2e5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e93333b View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2024

  1. Configuration menu
    Copy the full SHA
    35e4096 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    685aab5 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    39627d3 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b397bc5 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2024

  1. MAINT: handle return options + fix verbose optimize:

    - Remove iter_projg and iter_cost from return_options
    - Fix verbose at last iteration sbs optimize
    nghi-truyen committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    c255963 View commit details
    Browse the repository at this point in the history
  2. Fix api doc cance

    nghi-truyen committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    700d582 View commit details
    Browse the repository at this point in the history
  3. FIX: make check

    nghi-truyen committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    c1e1bca View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    775138c View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2024

  1. Configuration menu
    Copy the full SHA
    4166e0e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    72c2944 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b25b168 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    365691f View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    b635084 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2024

  1. Configuration menu
    Copy the full SHA
    14c6cd2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d15d4f3 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    26a28d3 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    abf32fa View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2024

  1. Configuration menu
    Copy the full SHA
    84ea17b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    23a35f1 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a9edd3b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    9962682 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    d8bed94 View commit details
    Browse the repository at this point in the history
  6. ENH: add methods to retrieve the model parameters from contorl vector:

    - set_control_optimize() method for retrieving the rr_parameters, rr_initial_states and nn_parameters from control value optimized by optimize() method
    - set_control_bayesian_optimize() method for retrieving bayesian parameters from control value optimized by bayesian_optimize() method
    
    TODO: add API doc and unit test for both methods.
    nghi-truyen committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    85a8e04 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    7a33fd2 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    de15ad3 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    c504046 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    c993de7 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    3824a6a View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    906a6dc View commit details
    Browse the repository at this point in the history
  13. Merge branch 'enh-retrieve-model-from-control' into enh-hybrid-models…

    …-gr-and-loieau-structures
    nghi-truyen committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    b0239d5 View commit details
    Browse the repository at this point in the history
  14. FIX: fix generating api doc:

    - Add two new methods to doc/source
    
    TODO: complete API doc and unit test for both methods.
    nghi-truyen committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    6fdad5a View commit details
    Browse the repository at this point in the history
  15. Merge branch 'enh-retrieve-model-from-control' into enh-hybrid-models…

    …-gr-and-loieau-structures
    nghi-truyen committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    4ab3cc6 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2024

  1. Configuration menu
    Copy the full SHA
    4ffb84c View commit details
    Browse the repository at this point in the history
  2. Merge branch 'enh-retrieve-model-from-control' into enh-hybrid-models…

    …-gr-and-loieau-structures
    nghi-truyen committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    b823e91 View commit details
    Browse the repository at this point in the history
  3. FIX: returns control with random values depending on random_state ins…

    …tead of nan for optimize control info with net
    nghi-truyen committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    23df534 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    5864ae9 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    ecd3d62 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    405145a View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    634ab8f View commit details
    Browse the repository at this point in the history
  8. Merge branch 'enh-retrieve-model-from-control' into enh-hybrid-models…

    …-gr-and-loieau-structures
    nghi-truyen committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    61191af View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    1b40d8d View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    fceee65 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    69d4483 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    d51c661 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    1fc025c View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    126039b View commit details
    Browse the repository at this point in the history
  15. Merge branch 'enh-retrieve-model-from-control' into enh-hybrid-models…

    …-gr-and-loieau-structures
    nghi-truyen committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    f98b8dd View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    c351f70 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2024

  1. MAINT: change default network for optimization with ann mapping (#7)

    * MAINT: change default net ann optimize + enhance net checking
    
    * Fix type raise error message net
    nghi-truyen committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    4ad25c0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1699029 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    bf4f676 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    094c28c View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    04a4a02 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    951cb15 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2024

  1. Configuration menu
    Copy the full SHA
    ebe3275 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #8 from nghi-truyen/merge-adaptive-opt

    MAINT: merge branch main into enh-adaptive-opt-for-all-mappings
    nghi-truyen authored Sep 10, 2024
    Configuration menu
    Copy the full SHA
    1f6798e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ab49571 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    dbcec34 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2024

  1. FIX PR: re-generate baseline and Merge remote-tracking branch 'upstre…

    …am/main' into enh-adaptive-optimizers
    nghi-truyen committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    5976ba9 View commit details
    Browse the repository at this point in the history
  2. Resolve merge conflict remote-tracking branch 'upstream/main' into en…

    …h-hybrid-models-gr-and-loieau-structures
    nghi-truyen committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    085cc1b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    67cb10c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    73b7ffb View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    313378c View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    fcc61f7 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2024

  1. Configuration menu
    Copy the full SHA
    1bbb453 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c8e3910 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ce38a16 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    2c5ee19 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    39ccb1d View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    3a4c611 View commit details
    Browse the repository at this point in the history
  7. MAINT: change default network for optimization with ann mapping

    - Change default net ann optimize
    - Enhance net checking
    - Correct/update lez regionalization for ann mapping
    nghi-truyen committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    10b2e6d View commit details
    Browse the repository at this point in the history
  8. Re-generate the baseline

    nghi-truyen committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    2538113 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    b2a7a1f View commit details
    Browse the repository at this point in the history
  10. Fix variable name api doc

    nghi-truyen committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    15150c5 View commit details
    Browse the repository at this point in the history
  11. Merge branch 'enh-retrieve-model-from-control' into enh-hybrid-models…

    …-gr-and-loieau-structures + generate baseline
    nghi-truyen committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    40449e6 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2024

  1. Configuration menu
    Copy the full SHA
    0616934 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    060bd9e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    328d804 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    18d653b View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    ae15fe1 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    76ee294 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    007454a View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    c905e83 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    7929854 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    7a6288b View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2024

  1. Configuration menu
    Copy the full SHA
    7c816ba View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    59a39a7 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    520dd3d View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2024

  1. Configuration menu
    Copy the full SHA
    66599fb View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2024

  1. Merge branch 'enh-retrieve-model-from-control' into enh-hybrid-models…

    …-gr-and-loieau-structures
    nghi-truyen committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    3eba900 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'upstream/main' into enh-hybrid-models-g…

    …r-and-loieau-structures
    nghi-truyen committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    70db3c1 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. Configuration menu
    Copy the full SHA
    0572fc6 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'upstream/main' into enh-hybrid-models-g…

    …r-and-loieau-structures
    nghi-truyen committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    c8a3d1d View commit details
    Browse the repository at this point in the history
  3. Revert _version.py

    nghi-truyen committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    5ed2a84 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2024

  1. Configuration menu
    Copy the full SHA
    ea64b28 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2024

  1. Merge remote-tracking branch 'upstream/main' into enh-hybrid-models-g…

    …r-and-loieau-structures
    nghi-truyen committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    281b52e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    535c4c3 View commit details
    Browse the repository at this point in the history