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

Adds sequence optimization #8

Merged
merged 135 commits into from
Sep 11, 2024
Merged

Adds sequence optimization #8

merged 135 commits into from
Sep 11, 2024

Commits on Apr 19, 2024

  1. Configuration menu
    Copy the full SHA
    24e4fc8 View commit details
    Browse the repository at this point in the history
  2. Adds sample gamma arrays

    cabb99 committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    cd7680c View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2024

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

Commits on May 20, 2024

  1. changed valid_indices=range(len(_AA)) default argument to valid_indic…

    …es=np.arange(len(_AA))
    Finley Clark committed May 20, 2024
    Configuration menu
    Copy the full SHA
    07a9f8f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    aeb85ad View commit details
    Browse the repository at this point in the history
  3. Merge branch 'main' of https://github.com/cabb99/Frustratometer

    pulling merged fork to local
    Finley Clark committed May 20, 2024
    Configuration menu
    Copy the full SHA
    98c1f14 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2024

  1. Configuration menu
    Copy the full SHA
    3977dd3 View commit details
    Browse the repository at this point in the history
  2. Adds methods to calculate AB

    cabb99 committed May 21, 2024
    Configuration menu
    Copy the full SHA
    dee0f9f View commit details
    Browse the repository at this point in the history

Commits on May 28, 2024

  1. Merge remote-tracking branch 'refs/remotes/origin/main'

    sync with remote to test frustratometer code against server
    Finley Clark committed May 28, 2024
    Configuration menu
    Copy the full SHA
    56cbd7e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b55c00e View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2024

  1. Update README.md

    Changes CI badge location. (Displays failing even if fails are passing)
    cabb99 authored Jun 1, 2024
    Configuration menu
    Copy the full SHA
    2b57b39 View commit details
    Browse the repository at this point in the history
  2. Update README.md

    Adds easter egg
    cabb99 authored Jun 1, 2024
    Configuration menu
    Copy the full SHA
    d16d396 View commit details
    Browse the repository at this point in the history
  3. Update README.md

    cabb99 authored Jun 1, 2024
    Configuration menu
    Copy the full SHA
    3569c0f View commit details
    Browse the repository at this point in the history
  4. Merge pull request #5 from cabb99/cabb99-readme

    Edits readme
    cabb99 authored Jun 1, 2024
    Configuration menu
    Copy the full SHA
    5ffc293 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2024

  1. added tests for sequence0 and sequence12

    Finley Clark committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    860ec9c View commit details
    Browse the repository at this point in the history
  2. added commented lines to tests/test_awsem_frustratometer.py which use…

    …r can uncomment to modify tests if desired
    Finley Clark committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    747fa60 View commit details
    Browse the repository at this point in the history
  3. fixed Frustratometer.frustration(kind='configurational') call to Frus…

    …tratometer.configurational_frustration()
    Finley Clark committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    22789ee View commit details
    Browse the repository at this point in the history
  4. Merge remote-tracking branch 'ftclark3/main'

    getting up to date
    Finley Clark committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    1f9f33f View commit details
    Browse the repository at this point in the history
  5. removed .rar file generated by frustratometer server (decompressed fi…

    …les already present in tests/data)
    Finley Clark committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    5be2d18 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. Configuration menu
    Copy the full SHA
    ea1d061 View commit details
    Browse the repository at this point in the history
  2. building on on previous commit

    Finley Clark committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    9d79197 View commit details
    Browse the repository at this point in the history
  3. building on on previous commit

    Finley Clark committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    755863f View commit details
    Browse the repository at this point in the history
  4. building on on previous commit

    Finley Clark committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    cbbb4c3 View commit details
    Browse the repository at this point in the history
  5. finished test updates -- increased tolerance so that low heterogeneit…

    …y sequences pass
    Finley Clark committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    9786f86 View commit details
    Browse the repository at this point in the history
  6. removed sequence parameter from frustratometer.Frustratometer.vmd() t…

    …o prevent accidental misuse
    Finley Clark committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    902550c View commit details
    Browse the repository at this point in the history
  7. added sequence argument back to vmd function but raise warning if seq…

    …uence passed to vmd is different from self.sequence
    Finley Clark committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    a8aaef2 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    4452b65 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2024

  1. Merge remote-tracking branch 'origin/main'

    bringing in carlos's stuff before push my commits back
    Finley Clark committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    e4751f5 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #6 from ftclark3/main

    Fixing configurational call
    cabb99 authored Jun 13, 2024
    Configuration menu
    Copy the full SHA
    c750ff7 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2024

  1. Configuration menu
    Copy the full SHA
    8c28161 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    deff675 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e011f9d View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2024

  1. fixed tcl visualization script so that highly or minimally frustrated…

    … interactions are not drawn between residues adjacent in sequence
    Finley Clark committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    ceedd9a View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2024

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

Commits on Jun 21, 2024

  1. Configuration menu
    Copy the full SHA
    b9f78d8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    529e669 View commit details
    Browse the repository at this point in the history
  3. Adds abstract class EnergyTerm

    cabb99 committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    8254b27 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2024

  1. Changes dictionaries to arrays

    cabb99 committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    6ad1af9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c62fffa View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9f22b6c View commit details
    Browse the repository at this point in the history
  4. Fixes inner product test

    cabb99 committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    5b31c29 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2024

  1. Configuration menu
    Copy the full SHA
    bd75883 View commit details
    Browse the repository at this point in the history
  2. Moves mask creation and region mean computation outside of the mean i…

    …nner product calculation
    cabb99 committed Jul 20, 2024
    Configuration menu
    Copy the full SHA
    562cf61 View commit details
    Browse the repository at this point in the history
  3. Reordered functions

    cabb99 committed Jul 20, 2024
    Configuration menu
    Copy the full SHA
    d2e8897 View commit details
    Browse the repository at this point in the history
  4. Adds diff methods

    cabb99 committed Jul 20, 2024
    Configuration menu
    Copy the full SHA
    ad240d9 View commit details
    Browse the repository at this point in the history
  5. Defines initial energy terms

    cabb99 committed Jul 20, 2024
    Configuration menu
    Copy the full SHA
    8021a4b View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2024

  1. committing changes i previously forgot to commit

    Finley Clark committed Jul 28, 2024
    Configuration menu
    Copy the full SHA
    acdceae View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2024

  1. Updates numpy types to ndarray

    cabb99 committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    0bf9f66 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2024

  1. Configuration menu
    Copy the full SHA
    6088d10 View commit details
    Browse the repository at this point in the history
  2. Changes input to 2D masks

    cabb99 committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    aae9309 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    48adf56 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    15579bb View commit details
    Browse the repository at this point in the history
  5. Removes masks

    cabb99 committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    ba21206 View commit details
    Browse the repository at this point in the history
  6. Moves repeated indices out of internal loops

    - 5x fold optimization
    cabb99 committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    64a7eaf View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    cff792c View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    21b9197 View commit details
    Browse the repository at this point in the history
  9. Changes types to ndarray

    cabb99 committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    f4d7204 View commit details
    Browse the repository at this point in the history
  10. Makes numba types explicit

    cabb99 committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    132ab9b View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    da84250 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    4128b20 View commit details
    Browse the repository at this point in the history
  13. Adds summed energy example

    cabb99 committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    a790dc8 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    aae63d1 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2024

  1. Adds caching to functions

    cabb99 committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    0bebd21 View commit details
    Browse the repository at this point in the history
  2. Adds caching to functions

    cabb99 committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    93cc2c2 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2024

  1. Sets gap energy to 0

    cabb99 committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    03d9a68 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2024

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

Commits on Aug 9, 2024

  1. Configuration menu
    Copy the full SHA
    a5fb8ad View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a0053b3 View commit details
    Browse the repository at this point in the history
  3. Defines functions for testing

    cabb99 committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    2e56a0d View commit details
    Browse the repository at this point in the history
  4. Moves test_ernegy_term class

    cabb99 committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    5e3634b View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2024

  1. Moves inner product tests

    cabb99 committed Aug 10, 2024
    Configuration menu
    Copy the full SHA
    5b90017 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2024

  1. Configuration menu
    Copy the full SHA
    1485199 View commit details
    Browse the repository at this point in the history
  2. Adds small pdb for tests

    cabb99 committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    177f9b7 View commit details
    Browse the repository at this point in the history
  3. Fixes math using Energy Terms

    cabb99 committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    5c6c54d View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2024

  1. Fixes montecarlo benchmarking

    cabb99 committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    dbf2c19 View commit details
    Browse the repository at this point in the history
  2. Reduces size of sample

    cabb99 committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    ceb8d27 View commit details
    Browse the repository at this point in the history
  3. Adds benchmark function

    cabb99 committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    4c5147d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    fab3e7c View commit details
    Browse the repository at this point in the history
  5. Moves energy term testing

    cabb99 committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    f77b2f8 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    bafbf5e View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    5c71174 View commit details
    Browse the repository at this point in the history
  8. diff optimization

    diff_mean_inner_product_2_by_2: 0.000599 seconds
    Compiled signatures: [(int64, int64, Array(int64, 1, 'A', True, aligned=True), Array(float64, 1, 'A', True, aligned=True))]
    No timing information available
    
    diff_mean_inner_product_2_by_2_v2: 0.000157 seconds
    Compiled signatures: [(int64, int64, Array(int64, 1, 'A', True, aligned=True), Array(float64, 1, 'A', True, aligned=True))]
    No timing information available
    cabb99 committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    f96066f View commit details
    Browse the repository at this point in the history
  9. Further optimizes diff_inner_product

    diff_mean_inner_product_2_by_2: 0.000591 seconds
    Compiled signatures: [(int64, int64, Array(int64, 1, 'A', True, aligned=True), Array(float64, 1, 'A', True, aligned=True))]
    No timing information available
    
    diff_mean_inner_product_2_by_2_v2: 0.000144 seconds
    Compiled signatures: [(int64, int64, Array(int64, 1, 'A', True, aligned=True), Array(float64, 1, 'A', True, aligned=True))]
    No timing information available
    cabb99 committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    8deb457 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    8c9c569 View commit details
    Browse the repository at this point in the history
  11. Removes extra comments

    cabb99 committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    e0e8355 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    844ca2f View commit details
    Browse the repository at this point in the history
  13. Fixes AWSEM energy average

    cabb99 committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    0c65329 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2024

  1. denergy_mutation passing tests

    cabb99 committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    3eafb10 View commit details
    Browse the repository at this point in the history
  2. Removes debugging code

    cabb99 committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    8777b17 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c054d97 View commit details
    Browse the repository at this point in the history
  4. Optimizes variance calculation

    cabb99 committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    8bf51b7 View commit details
    Browse the repository at this point in the history
  5. Fixes montecarlo annealing

    cabb99 committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    750758c View commit details
    Browse the repository at this point in the history
  6. Fixes parallel tempering

    cabb99 committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    4d40034 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    bf1e6c5 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    079aab6 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    c02b565 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    44459ad View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2024

  1. Simplifies writing to a file

    cabb99 committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    8fe44f7 View commit details
    Browse the repository at this point in the history
  2. Adds csv_writter wrapper

    cabb99 committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    4fb0b0a View commit details
    Browse the repository at this point in the history
  3. Changes descriptions

    cabb99 committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    8620a3a View commit details
    Browse the repository at this point in the history
  4. Reorders imports

    cabb99 committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    3414bf5 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    cddd23c View commit details
    Browse the repository at this point in the history
  6. Removes extra tests

    cabb99 committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    b418abd View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    91b920a View commit details
    Browse the repository at this point in the history
  8. Removes plotting test

    cabb99 committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    69ab38a View commit details
    Browse the repository at this point in the history
  9. Adds sample awsem gamma files

    cabb99 committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    a60d559 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    1f91b98 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    2163fa3 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    fee3f27 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    9090d6a View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    53e9505 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2024

  1. Require numpy<2 (for prody)

    cabb99 committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    cdde686 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2024

  1. Configuration menu
    Copy the full SHA
    e5c5d1f View commit details
    Browse the repository at this point in the history
  2. Fixes error on yaml syntax

    cabb99 committed Aug 17, 2024
    Configuration menu
    Copy the full SHA
    c8a053a View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2024

  1. Fixes numpy<2 requirement

    cabb99 committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    043dfb7 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2024

  1. Configuration menu
    Copy the full SHA
    25df349 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'ftclark3/main'

    latest updates from carlos and hana's modifications
    Finley Clark committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    47c8ad4 View commit details
    Browse the repository at this point in the history
  3. added option to write frustratogram to image file and exit instead of…

    … making movie or opening vmd and leaving it there
    Finley Clark committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    87d5505 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    44300ed View commit details
    Browse the repository at this point in the history
  5. Minor formatting

    cabb99 committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    761eb11 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    92748fd View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    54da893 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    a426b60 View commit details
    Browse the repository at this point in the history
  9. Adds energy term benchmarks

    cabb99 committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    106793b View commit details
    Browse the repository at this point in the history
  10. Removes extra tests

    cabb99 committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    48a9388 View commit details
    Browse the repository at this point in the history
  11. Merge pull request #11 from ftclark3/main

    write frustratogram image instead of movie
    cabb99 authored Aug 28, 2024
    Configuration menu
    Copy the full SHA
    53f2be1 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2024

  1. Removes 3.12 test

    cabb99 committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    b266b0e View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2024

  1. fixed numbification

    Finley Clark committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    2574762 View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2024

  1. Merge pull request #12 from ftclark3/ML

    fixed numbification
    cabb99 authored Sep 8, 2024
    Configuration menu
    Copy the full SHA
    860ff0d View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2024

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

Commits on Sep 11, 2024

  1. Merges with main

    cabb99 committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    3c274ae View commit details
    Browse the repository at this point in the history
  2. Merge pull request #10 from cabb99/ML

    Sequence optimization
    cabb99 authored Sep 11, 2024
    Configuration menu
    Copy the full SHA
    48ae297 View commit details
    Browse the repository at this point in the history
  3. Merges changes

    cabb99 committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    9619814 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f2b61ef View commit details
    Browse the repository at this point in the history