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.

Sign up for GitHub

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

Jump to bottom

NEW feature: intermediate scattering function #1042

Open
wants to merge 24 commits into
base: main
Choose a base branch
from
Open

NEW feature: intermediate scattering function #1042

wants to merge 24 commits into from

Commits on Nov 30, 2022

  1. boilerplate for intermediate scattering

    Roy-Kid committed Nov 30, 2022
    Configuration menu
    Copy the full SHA
    af1da72 View commit details
    Browse the repository at this point in the history

  2. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Nov 30, 2022
    Configuration menu
    Copy the full SHA
    565a0be View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2022

  1. complete the framework of isf, need to debug and test

    Roy-Kid committed Dec 1, 2022
    Configuration menu
    Copy the full SHA
    acc9b40 View commit details
    Browse the repository at this point in the history

  2. fix conflict

    Roy-Kid committed Dec 1, 2022
    Configuration menu
    Copy the full SHA
    bec9619 View commit details
    Browse the repository at this point in the history

  3. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Dec 1, 2022
    Configuration menu
    Copy the full SHA
    fcf006c View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2022

  1. fix lots of bugs, compile pass

    Roy-Kid committed Dec 3, 2022
    Configuration menu
    Copy the full SHA
    32c340d View commit details
    Browse the repository at this point in the history

  2. new problem: We cant set new attribute in diffraction.pyx, so we cant… 

    … store the results of each accumulate at the python-end; so we need to create a data structure to save multiple getBinCounts of self and distinct function and convert it to (n_frames, nbins) array
    Roy-Kid committed Dec 3, 2022
    Configuration menu
    Copy the full SHA
    9138a86 View commit details
    Browse the repository at this point in the history

  3. fix conflicts

    Roy-Kid committed Dec 3, 2022
    Configuration menu
    Copy the full SHA
    a495664 View commit details
    Browse the repository at this point in the history

  4. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Dec 3, 2022
    Configuration menu
    Copy the full SHA
    18ac4fb View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2022

  1. restructure previous code, comment out intermediate scattering function

    @tommy-waltmann
    tommy-waltmann committed Dec 7, 2022
    Configuration menu
    Copy the full SHA
    96f59d0 View commit details
    Browse the repository at this point in the history

  2. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Dec 7, 2022
    Configuration menu
    Copy the full SHA
    41b57de View commit details
    Browse the repository at this point in the history

  3. linting

    @tommy-waltmann
    tommy-waltmann committed Dec 7, 2022
    Configuration menu
    Copy the full SHA
    c09064c View commit details
    Browse the repository at this point in the history

  4. Merge branch 'dev-isf' of github.com:roy-kid/freud into dev-isf

    @tommy-waltmann
    tommy-waltmann committed Dec 7, 2022
    Configuration menu
    Copy the full SHA
    3323202 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into dev-isf

    @tommy-waltmann
    tommy-waltmann committed Dec 7, 2022
    Configuration menu
    Copy the full SHA
    9575ee6 View commit details
    Browse the repository at this point in the history

  6. put boilerplate in place for implementing intermediate scattering fun… 

    …ction
    @tommy-waltmann
    tommy-waltmann committed Dec 7, 2022
    Configuration menu
    Copy the full SHA
    aabf02b View commit details
    Browse the repository at this point in the history

  7. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Dec 7, 2022
    Configuration menu
    Copy the full SHA
    9671b5f View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2022

  1. more code restructuring

    @tommy-waltmann
    tommy-waltmann committed Dec 13, 2022
    Configuration menu
    Copy the full SHA
    0402e0f View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2022

  1. finish code restructure, implementation is wrong

    @tommy-waltmann
    tommy-waltmann committed Dec 14, 2022
    Configuration menu
    Copy the full SHA
    99d4b6e View commit details
    Browse the repository at this point in the history

  2. linting

    @tommy-waltmann
    tommy-waltmann committed Dec 14, 2022
    Configuration menu
    Copy the full SHA
    82cbbcc View commit details
    Browse the repository at this point in the history

Commits on Dec 25, 2022

  1. get fatal error at IntermediateScattering.cc line 121 and 122: Attemp… 

    …ted to access index 750 in an array of size 100
    Roy-Kid committed Dec 25, 2022
    Configuration menu
    Copy the full SHA
    d2a74c1 View commit details
    Browse the repository at this point in the history

  2. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Dec 25, 2022
    Configuration menu
    Copy the full SHA
    53642c4 View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2023

  1. Merge branch 'master' into dev-isf

    @tommy-waltmann
    tommy-waltmann committed Jan 3, 2023
    Configuration menu
    Copy the full SHA
    fd08212 View commit details
    Browse the repository at this point in the history

  2. fix oob crashes

    @tommy-waltmann
    tommy-waltmann committed Jan 3, 2023
    Configuration menu
    Copy the full SHA
    78e2bb6 View commit details
    Browse the repository at this point in the history

  3. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Jan 3, 2023
    Configuration menu
    Copy the full SHA
    86374b0 View commit details
    Browse the repository at this point in the history