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

New benchmarking examples #266

Merged
merged 91 commits into from
Jan 16, 2023
Merged

New benchmarking examples #266

merged 91 commits into from
Jan 16, 2023

Commits on Feb 19, 2022

  1. Implement x and x_dot to be tuples in pysindy.py

    Implemented 1D and multiple trajectories cases and wrote corresponding tests.
    OliviaZ0826 committed Feb 19, 2022
    Configuration menu
    Copy the full SHA
    529557a View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2022

  1. Handle tuple input in PDE and Weak PDE cases

    Raise error if the inputs for pde cases contain tuple, and write corresponding tests. Modified conftest.py: return additional t in data_3d_random_pde and data_5d_random_pde
    OliviaZ0826 committed Mar 1, 2022
    Configuration menu
    Copy the full SHA
    172c62a View commit details
    Browse the repository at this point in the history
  2. fixed flake8 issue

    OliviaZ0826 committed Mar 1, 2022
    Configuration menu
    Copy the full SHA
    16f3089 View commit details
    Browse the repository at this point in the history
  3. fix flake8 issue

    OliviaZ0826 committed Mar 1, 2022
    Configuration menu
    Copy the full SHA
    0af4176 View commit details
    Browse the repository at this point in the history
  4. Fix Linting issue

    OliviaZ0826 committed Mar 1, 2022
    Configuration menu
    Copy the full SHA
    42bc8a2 View commit details
    Browse the repository at this point in the history
  5. Fix Linting issue

    OliviaZ0826 committed Mar 1, 2022
    Configuration menu
    Copy the full SHA
    95f3139 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2022

  1. chaotic level vs noise level vs model performance

    Log-normal contour plot of RMSE between chaotic level and noise level for X and X dot.
    OliviaZ0826 authored Jun 28, 2022
    Configuration menu
    Copy the full SHA
    d789516 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    79faf6d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8b29b62 View commit details
    Browse the repository at this point in the history
  4. Modified linting

    OliviaZ0826 committed Jun 28, 2022
    Configuration menu
    Copy the full SHA
    a099d7d View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2022

  1. Updated black version

    OliviaZ0826 authored Jun 29, 2022
    Configuration menu
    Copy the full SHA
    650307f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9b8476e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9f74aba View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    ac0efff View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    1116ff7 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2022

  1. Configuration menu
    Copy the full SHA
    962c2c8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    adcdcab View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    3eae8c7 View commit details
    Browse the repository at this point in the history
  4. Use updated black format

    OliviaZ0826 committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    6b0c899 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    9ae5b88 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    91a2954 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2022

  1. Merged lanyues branch with new changes on main branch.

    Alan Kaptanoglu authored and Alan Kaptanoglu committed Jul 5, 2022
    Configuration menu
    Copy the full SHA
    97e3887 View commit details
    Browse the repository at this point in the history
  2. Fixed the testing issues by getting rid of the tuple requirements for…

    … now.
    Alan Kaptanoglu authored and Alan Kaptanoglu committed Jul 5, 2022
    Configuration menu
    Copy the full SHA
    2ef6641 View commit details
    Browse the repository at this point in the history
  3. Fixed notebook issue and linting issue.

    Alan Kaptanoglu authored and Alan Kaptanoglu committed Jul 5, 2022
    Configuration menu
    Copy the full SHA
    73adbde View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2022

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

Commits on Jul 19, 2022

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

Commits on Aug 14, 2022

  1. added a reduced script that calculates a lot more polynomial systems …

    …and avoids integrating the models for speed. Now is quite fast, and the plan is to use this to look at syntactical complexity.
    Alan Kaptanoglu authored and Alan Kaptanoglu committed Aug 14, 2022
    Configuration menu
    Copy the full SHA
    d88e61b View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2022

  1. Still working on making another example notebook. Doesnt seem to vary…

    … with syntax so far, which is surprising, but need to make sure it is plotting properly.
    Alan Kaptanoglu authored and Alan Kaptanoglu committed Aug 15, 2022
    Configuration menu
    Copy the full SHA
    a69f9b6 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2022

  1. Changed stlsq to stop giving so many LinAlgWarnings and SparsityWarni…

    …ngs. Made a new script that loops over all the polynomial systems in the dysts database, and fits them (without noise). Also wrote a script to load in all the ODE functions as strings, and parse them to extract all the model coefficients. Needs some tuning, but so far looks like it is performing well compared to the true coefficients.
    Alan Kaptanoglu authored and Alan Kaptanoglu committed Aug 17, 2022
    Configuration menu
    Copy the full SHA
    f518f5c View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2022

  1. Editted Example 16 notebook file to read in the chaotic database.

    Alan Kaptanoglu authored and Alan Kaptanoglu committed Aug 22, 2022
    Configuration menu
    Copy the full SHA
    da8bd72 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2022

  1. Fixed error in model score in the rudy algorithm 2, where the xtest d…

    …ata was being scored without the corresponding ttest time range, so errors were not being computed correctly for the algorithm.
    Alan Kaptanoglu authored and Alan Kaptanoglu committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    f773f34 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2022

  1. Seem to be some interesting issues with the rudy algorithm and model …

    …score. Going to keep debugging this, and merge the main branch in case there are some bug fixes there.
    Alan Kaptanoglu authored and Alan Kaptanoglu committed Sep 6, 2022
    Configuration menu
    Copy the full SHA
    56f4e2e View commit details
    Browse the repository at this point in the history
  2. Seem to be some interesting issues with the rudy algorithm and model …

    …score. Going to keep debugging this, and merge the main branch in case there are some bug fixes there.
    Alan Kaptanoglu authored and Alan Kaptanoglu committed Sep 6, 2022
    Configuration menu
    Copy the full SHA
    6ea0210 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'master' into lanyue_work

    Alan Kaptanoglu authored and Alan Kaptanoglu committed Sep 6, 2022
    Configuration menu
    Copy the full SHA
    79dc1e2 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2022

  1. Working on getting something nicely tuned and figuring out good hyper…

    …parameters for each of the dynamical systems. Going to see how well it generalizes when I add in some error.
    Alan Kaptanoglu authored and Alan Kaptanoglu committed Sep 9, 2022
    Configuration menu
    Copy the full SHA
    36e6e8b View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2022

  1. Add files via upload

    OliviaZ0826 authored Sep 18, 2022
    Configuration menu
    Copy the full SHA
    a901049 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2022

  1. Fixed Linting Issue

    OliviaZ0826 authored Sep 19, 2022
    Configuration menu
    Copy the full SHA
    6d238c4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5871378 View commit details
    Browse the repository at this point in the history
  3. Still working on getting something useful out of the scale separation…

    … analysis.
    Alan Kaptanoglu authored and Alan Kaptanoglu committed Sep 19, 2022
    Configuration menu
    Copy the full SHA
    06042f6 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'lanyue_work' of https://github.com/dynamicslab/pysindy

    …into lanyue_work
    Alan Kaptanoglu authored and Alan Kaptanoglu committed Sep 19, 2022
    Configuration menu
    Copy the full SHA
    8c530bb View commit details
    Browse the repository at this point in the history
  5. Merge branch 'master' into lanyue_work

    Alan Kaptanoglu authored and Alan Kaptanoglu committed Sep 19, 2022
    Configuration menu
    Copy the full SHA
    aa836e6 View commit details
    Browse the repository at this point in the history
  6. reformatted the complexiy file.

    Alan Kaptanoglu authored and Alan Kaptanoglu committed Sep 19, 2022
    Configuration menu
    Copy the full SHA
    2c7a5a3 View commit details
    Browse the repository at this point in the history
  7. Removed the json files and fixed the utils linting.

    Alan Kaptanoglu authored and Alan Kaptanoglu committed Sep 19, 2022
    Configuration menu
    Copy the full SHA
    8dfa4ca View commit details
    Browse the repository at this point in the history
  8. Still working on linting errors in util file.

    Alan Kaptanoglu authored and Alan Kaptanoglu committed Sep 19, 2022
    Configuration menu
    Copy the full SHA
    24f7e66 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2022

  1. Switching back to my laptop. Wrote some code to plot and compute a la…

    …rge set of test trajectories near the attracting set.
    akaptano committed Sep 26, 2022
    Configuration menu
    Copy the full SHA
    2fbe140 View commit details
    Browse the repository at this point in the history
  2. Added an identical notebook to try running the code without normaliza…

    …tion. Currently ode simulation taking too long with these long time series. Will need to think about this.
    akaptano committed Sep 26, 2022
    Configuration menu
    Copy the full SHA
    23dfe6a View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2022

  1. Got the trajectory generation and testing working. Looks like it work…

    …s quite well even with 1 percent noise. Will polish this up for paper in a bit.
    akaptano committed Sep 27, 2022
    Configuration menu
    Copy the full SHA
    09fb157 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2022

  1. Moving over to my laptop. Going to try some initial conditions consid…

    …erably off the attractor once the models are trained.
    akaptano committed Sep 28, 2022
    Configuration menu
    Copy the full SHA
    90be367 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2022

  1. Switching branches really quickly to make a cvxpy-free branch.

    Alan Kaptanoglu authored and Alan Kaptanoglu committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    25ef7ef View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2022

  1. Merge branch 'master' into lanyue_work

    Alan Kaptanoglu authored and Alan Kaptanoglu committed Oct 5, 2022
    Configuration menu
    Copy the full SHA
    78c3fd0 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2022

  1. Notebooks are a mess currently but feel like we are getting somewhere…

    … with concluding about the dynamical properties.
    Alan Kaptanoglu authored and Alan Kaptanoglu committed Oct 12, 2022
    Configuration menu
    Copy the full SHA
    4db05f6 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2022

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

Commits on Nov 8, 2022

  1. Made small change to do log-log fits in the r2 notebook. Going to mer…

    …ge in main branch now to have access to miosr optimizer.
    Alan Kaptanoglu authored and Alan Kaptanoglu committed Nov 8, 2022
    Configuration menu
    Copy the full SHA
    d44c613 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' into lanyue_work

    Alan Kaptanoglu authored and Alan Kaptanoglu committed Nov 8, 2022
    Configuration menu
    Copy the full SHA
    d39d1ca View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2022

  1. Added the functionality for looping over different optimizers. Have s…

    …eparate notebooks for now because computing everything is slow for some of the optimizers.
    Alan Kaptanoglu authored and Alan Kaptanoglu committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    3594227 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2022

  1. Committing current version of the optimizer notebooks so I can switch…

    … branches and work on something else briefly.
    Alan Kaptanoglu authored and Alan Kaptanoglu committed Nov 11, 2022
    Configuration menu
    Copy the full SHA
    7d9499a View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2022

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

Commits on Nov 28, 2022

  1. Cleaned up the lanyue branch to get it ready for a pull request to th…

    …e main branch. Also moved the dysts-specific functionality (like computing the dynamical properties) to a pull request for the dysts library, which has now been merged. Removed a lot of the older files - if we need them later can grab from earlier commits. Still rerunning main Pareto scan script to clean it up and make sure it is working right.
    Alan Kaptanoglu authored and Alan Kaptanoglu committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    985c1cc View commit details
    Browse the repository at this point in the history
  2. Deleted or move some more older files. Trying to merge with lanyues m…

    …ost recent changes.
    Alan Kaptanoglu authored and Alan Kaptanoglu committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    ac452a9 View commit details
    Browse the repository at this point in the history
  3. Added back in the saved files from the Pareto scans.

    Alan Kaptanoglu authored and Alan Kaptanoglu committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    2c1df9a View commit details
    Browse the repository at this point in the history
  4. Merge branch 'lanyue_work' of https://github.com/dynamicslab/pysindy

    …into lanyue_work
    Alan Kaptanoglu authored and Alan Kaptanoglu committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    515ecd3 View commit details
    Browse the repository at this point in the history
  5. Did some more reorganizing. Seems to be an issue with the Pareto scan…

    … script now, STLSQ results are quite different than before. Chasing it down now.
    Alan Kaptanoglu authored and Alan Kaptanoglu committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    130ea35 View commit details
    Browse the repository at this point in the history
  6. Removed l0 penalty term from the Pareto scan parameters.

    Alan Kaptanoglu authored and Alan Kaptanoglu committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    6ddd04b View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2022

  1. Cleaned up the code substantially, added comments, and minimized the …

    …complexity.
    Alan Kaptanoglu authored and Alan Kaptanoglu committed Nov 30, 2022
    Configuration menu
    Copy the full SHA
    c0a5c65 View commit details
    Browse the repository at this point in the history
  2. May have figured out flake8 issue out. Seems like it moved from gitla…

    …b to github so need to update the pre-commit file.
    Alan Kaptanoglu authored and Alan Kaptanoglu committed Nov 30, 2022
    Configuration menu
    Copy the full SHA
    afc2f93 View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2022

  1. Trying the sphinx fix from zach.

    Alan Kaptanoglu authored and Alan Kaptanoglu committed Dec 3, 2022
    Configuration menu
    Copy the full SHA
    b5e3bac View commit details
    Browse the repository at this point in the history
  2. Try to fix online gurobipy issues by restricting to version 9.5.2 ins…

    …tead of version 10.
    Alan Kaptanoglu authored and Alan Kaptanoglu committed Dec 3, 2022
    Configuration menu
    Copy the full SHA
    ffdbbf4 View commit details
    Browse the repository at this point in the history
  3. Fixed test_fit_warn from Zach fix for Python 3.8

    Alan Kaptanoglu authored and Alan Kaptanoglu committed Dec 3, 2022
    Configuration menu
    Copy the full SHA
    2fb6b43 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2022

  1. Add notes and further cleaned the notebook

    Add words description to the notebook and removed unimportant plots as trials.
    OliviaZ0826 committed Dec 5, 2022
    Configuration menu
    Copy the full SHA
    f168aa8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0423bd3 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2022

  1. recycled library matrices and x_test_dots in hyperparameter sweeps an…

    …d added strong_rmse option
    znicolaou committed Dec 8, 2022
    Configuration menu
    Copy the full SHA
    206d2c5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b89b47a View commit details
    Browse the repository at this point in the history
  3. fixed linting

    znicolaou committed Dec 8, 2022
    Configuration menu
    Copy the full SHA
    2e7bae8 View commit details
    Browse the repository at this point in the history
  4. double fixed linting

    znicolaou committed Dec 8, 2022
    Configuration menu
    Copy the full SHA
    f01e0d5 View commit details
    Browse the repository at this point in the history
  5. fixed coefficient ordering

    znicolaou committed Dec 8, 2022
    Configuration menu
    Copy the full SHA
    928e7ef View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2022

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

Commits on Dec 30, 2022

  1. cleaned up the notebooks quite a bit. Added a new python file for run…

    …ning all the results at once so dont need multiple notebooks.
    Alan Kaptanoglu authored and Alan Kaptanoglu committed Dec 30, 2022
    Configuration menu
    Copy the full SHA
    a8e23bf View commit details
    Browse the repository at this point in the history
  2. Added some print statements. switching to try and run this on lambda.

    Alan Kaptanoglu authored and Alan Kaptanoglu committed Dec 30, 2022
    Configuration menu
    Copy the full SHA
    1bfd15d View commit details
    Browse the repository at this point in the history
  3. Fixed the print of the percentage noise.

    Alan Kaptanoglu authored and Alan Kaptanoglu committed Dec 30, 2022
    Configuration menu
    Copy the full SHA
    f617d03 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2023

  1. Deleted old run files. Added new run files, including weak form runs …

    …for all the optimizers except MIOSR. Need to update the plotting notebook to use the new data. Made some small changes to the run_all script so that all of the optimizers can run weak form.
    akaptano committed Jan 2, 2023
    Configuration menu
    Copy the full SHA
    a205977 View commit details
    Browse the repository at this point in the history
  2. Added missing miosr files.

    akaptano committed Jan 2, 2023
    Configuration menu
    Copy the full SHA
    b8bf6fb View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2023

  1. Reran the scans except MIOSR, fixing and issue that the true coeffici…

    …ents were being reshuffled even when weak form was false.
    akaptano committed Jan 4, 2023
    Configuration menu
    Copy the full SHA
    453ed8d View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2023

  1. Waiting for MIOSR results to clean up and fix optimizer comparison no…

    …tebook.
    Alan Kaptanoglu authored and Alan Kaptanoglu committed Jan 5, 2023
    Configuration menu
    Copy the full SHA
    cd5db7f View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2023

  1. Added the MIOSR results.

    akaptano committed Jan 6, 2023
    Configuration menu
    Copy the full SHA
    cf402ef View commit details
    Browse the repository at this point in the history
  2. Merge branch 'lanyue_work' of https://github.com/dynamicslab/pysindy

    …into lanyue_work
    Alan Kaptanoglu authored and Alan Kaptanoglu committed Jan 6, 2023
    Configuration menu
    Copy the full SHA
    eb7430a View commit details
    Browse the repository at this point in the history
  3. Merged master into lanyue branch.

    Alan Kaptanoglu authored and Alan Kaptanoglu committed Jan 6, 2023
    Configuration menu
    Copy the full SHA
    4323abc View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2023

  1. Fixed an issue where the weak form results were producing incorrect n…

    …umbers. The issue is that the true_coefficients matrix was reordered for the weak library, but the error matries were also reordered, so then they didnt match again. Now the true_coefficients are left alone. Reran the STLSQ results which are looking much more reasonable now.
    akaptano committed Jan 15, 2023
    Configuration menu
    Copy the full SHA
    1d45892 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'lanyue_work' of https://github.com/dynamicslab/pysindy

    …into lanyue_work
    Alan Kaptanoglu committed Jan 15, 2023
    Configuration menu
    Copy the full SHA
    759ca2b View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2023

  1. Configuration menu
    Copy the full SHA
    b55d717 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'lanyue_work' of https://github.com/dynamicslab/pysindy

    …into lanyue_work
    Alan Kaptanoglu committed Jan 16, 2023
    Configuration menu
    Copy the full SHA
    6447ca4 View commit details
    Browse the repository at this point in the history
  3. Reran optimizer_comparison notebook with the updated results. Barring…

    … linting and pytest errors, this is ready for a merge.
    Alan Kaptanoglu committed Jan 16, 2023
    Configuration menu
    Copy the full SHA
    200fe9d View commit details
    Browse the repository at this point in the history