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

Feature/new filter #1068

Merged
merged 57 commits into from
Jan 29, 2024
Merged

Feature/new filter #1068

merged 57 commits into from
Jan 29, 2024

Commits on Nov 10, 2021

  1. created new classes for new filter-method

    @kloss-o
    kloss-o committed Nov 10, 2021
    Configuration menu
    Copy the full SHA
    7ebad1a View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2021

  1. created new classes for new filter-method

    @kloss-o
    kloss-o committed Nov 16, 2021
    Configuration menu
    Copy the full SHA
    2ff6774 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2021

  1. added new filters. Ready for testing

    @kloss-o
    kloss-o committed Nov 22, 2021
    Configuration menu
    Copy the full SHA
    cc9f648 View commit details
    Browse the repository at this point in the history

  2. finished a few simple tests for new filter-objects

    @kloss-o
    kloss-o committed Nov 22, 2021
    Configuration menu
    Copy the full SHA
    ac68e8d View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2021

  1. added more tests

    Oliver Kloß committed Nov 30, 2021
    Configuration menu
    Copy the full SHA
    7b9210c View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2021

  1. old filter-functionaltiy added again + tests

    Oliver Kloß committed Dec 7, 2021
    Configuration menu
    Copy the full SHA
    e464fbc View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2021

  1. added doc

    Oliver Kloß committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    1d9bd8b View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2022

  1. added doctrings to sphinx documentation

    Oliver Kloß committed Feb 1, 2022
    Configuration menu
    Copy the full SHA
    5587582 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2022

  1. renamed all FilterConditions to match python standards

    Oliver Kloß committed Feb 4, 2022
    Configuration menu
    Copy the full SHA
    03c4253 View commit details
    Browse the repository at this point in the history

  2. pep8 standards

    Oliver Kloß committed Feb 4, 2022
    Configuration menu
    Copy the full SHA
    06d9b55 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2022

  1. fixed remaining pep8 issues

    Oliver Kloß committed Feb 8, 2022
    Configuration menu
    Copy the full SHA
    fd34add View commit details
    Browse the repository at this point in the history

  2. shortening lines

    Oliver Kloß committed Feb 8, 2022
    Configuration menu
    Copy the full SHA
    3692618 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2022

  1. Update neo/core/container.py 

    Co-authored-by: Julia Sprenger <julia.sprenger@rwth-aachen.de>
    @kloss-o @JuliaSprenger
    kloss-o and JuliaSprenger authored Feb 10, 2022
    Configuration menu
    Copy the full SHA
    2d1af00 View commit details
    Browse the repository at this point in the history

  2. Update neo/core/container.py 

    Co-authored-by: Julia Sprenger <julia.sprenger@rwth-aachen.de>
    @kloss-o @JuliaSprenger
    kloss-o and JuliaSprenger authored Feb 10, 2022
    Configuration menu
    Copy the full SHA
    62558c8 View commit details
    Browse the repository at this point in the history

  3. Update neo/core/container.py 

    Co-authored-by: Julia Sprenger <julia.sprenger@rwth-aachen.de>
    @kloss-o @JuliaSprenger
    kloss-o and JuliaSprenger authored Feb 10, 2022
    Configuration menu
    Copy the full SHA
    8b7bd40 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2022

  1. Update neo/test/coretest/test_container.py 

    Co-authored-by: Julia Sprenger <julia.sprenger@rwth-aachen.de>
    @kloss-o @JuliaSprenger
    kloss-o and JuliaSprenger authored Feb 17, 2022
    Configuration menu
    Copy the full SHA
    528514c View commit details
    Browse the repository at this point in the history

  2. changed a few things based on feedback on pull request

    Oliver Kloß committed Feb 17, 2022
    Configuration menu
    Copy the full SHA
    4e98709 View commit details
    Browse the repository at this point in the history

  3. fixed last pep8speaks issue

    Oliver Kloß committed Feb 17, 2022
    Configuration menu
    Copy the full SHA
    75acb73 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2022

  1. moved filters to separate module and renamed them

    Oliver Kloß committed Jun 14, 2022
    Configuration menu
    Copy the full SHA
    417fcad View commit details
    Browse the repository at this point in the history

  2. added changes from branch enh/fastFilter

    Oliver Kloß committed Jun 14, 2022
    Configuration menu
    Copy the full SHA
    f2f560c View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/master' into feature/newFilter 

    # Conflicts:
#	doc/source/authors.rst
    Oliver Kloß committed Jun 14, 2022
    Configuration menu
    Copy the full SHA
    fcc8836 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2022

  1. fixed filtering error

    Oliver Kloß committed Jun 28, 2022
    Configuration menu
    Copy the full SHA
    8b53e11 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2022

  1. review

    Moritz-Alexander-Kern committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    e11a7d6 View commit details
    Browse the repository at this point in the history

  2. refactor names for limits

    Moritz-Alexander-Kern committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    e21e447 View commit details
    Browse the repository at this point in the history

  3. remove brackets

    Moritz-Alexander-Kern committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    ff6f631 View commit details
    Browse the repository at this point in the history

  4. remove __init__

    Moritz-Alexander-Kern committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    98e0a3d View commit details
    Browse the repository at this point in the history

  5. add module description

    Moritz-Alexander-Kern committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    0d734d0 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2022

  1. re-add __init__ for subclasses

    Moritz-Alexander-Kern committed Jul 21, 2022
    Configuration menu
    Copy the full SHA
    ac957b2 View commit details
    Browse the repository at this point in the history

  2. undo renaming for InRange FilterCondition

    Moritz-Alexander-Kern committed Jul 21, 2022
    Configuration menu
    Copy the full SHA
    270f8a8 View commit details
    Browse the repository at this point in the history

  3. re-ad __init__ to Equal FilterCondition

    Moritz-Alexander-Kern committed Jul 21, 2022
    Configuration menu
    Copy the full SHA
    7856030 View commit details
    Browse the repository at this point in the history

  4. add comment to imports in __init__ to enable review

    Moritz-Alexander-Kern committed Jul 21, 2022
    Configuration menu
    Copy the full SHA
    80606b9 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2023

  1. Merge pull request #42 from INM-6/review_new_filter 

    Review new filter
    @Moritz-Alexander-Kern
    Moritz-Alexander-Kern authored Jul 21, 2023
    Configuration menu
    Copy the full SHA
    b3800ae View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into feature/newFilter 

    # Conflicts:
#	neo/core/container.py
#	neo/test/coretest/test_container.py
    Moritz-Alexander-Kern committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    17666ac View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2023

  1. do not import filters individually into top level namespace

    Moritz-Alexander-Kern committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    bf1c51d View commit details
    Browse the repository at this point in the history

  2. revert to previous version of docstring of docstring for filterdata

    Moritz-Alexander-Kern committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    4e1df3b View commit details
    Browse the repository at this point in the history

  3. remove whitespace changes

    Moritz-Alexander-Kern committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    f9e1d29 View commit details
    Browse the repository at this point in the history

  4. changed class names for GreaterThanEqual, LessThanEqual and Equal

    Moritz-Alexander-Kern committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    21f829a View commit details
    Browse the repository at this point in the history

  5. adapt unittests according to new class names

    Moritz-Alexander-Kern committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    e46e9ed View commit details
    Browse the repository at this point in the history

  6. eliminate duplicates with a dict comprehension, using id() as the key… 

    …, as no duplicate keys can exist for a dict, duplicates will be removed with this
    Moritz-Alexander-Kern committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    f183572 View commit details
    Browse the repository at this point in the history

  7. remove else

    Moritz-Alexander-Kern committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    f50f222 View commit details
    Browse the repository at this point in the history

  8. replace list with generator before returning tuple

    Moritz-Alexander-Kern committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    dd9d2f0 View commit details
    Browse the repository at this point in the history

  9. use isinstance to check for type

    Moritz-Alexander-Kern committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    56c2caf View commit details
    Browse the repository at this point in the history

  10. change names, add docstrings to classes

    Moritz-Alexander-Kern committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    f8a56ea View commit details
    Browse the repository at this point in the history

  11. use abstract base class from the abc module for the FilterCondition c… 

    …lass
    Moritz-Alexander-Kern committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    54373b9 View commit details
    Browse the repository at this point in the history

  12. fix typo in docstring

    Moritz-Alexander-Kern committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    4616987 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'NeuralEnsemble:master' into feature/newFilter

    @Moritz-Alexander-Kern
    Moritz-Alexander-Kern authored Jul 28, 2023
    Configuration menu
    Copy the full SHA
    812ed39 View commit details
    Browse the repository at this point in the history

  14. undo returns for tuples

    Moritz-Alexander-Kern committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    afdc1f5 View commit details
    Browse the repository at this point in the history

  15. add module docstring for filters.py

    Moritz-Alexander-Kern committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    d124f1b View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2023

  1. fix doctrings and class names

    Moritz-Alexander-Kern committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    d50cb3b View commit details
    Browse the repository at this point in the history

  2. refactor unit tests

    Moritz-Alexander-Kern committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    ca82dcd View commit details
    Browse the repository at this point in the history

  3. add tuples and sets to IsIn class

    Moritz-Alexander-Kern committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    70a425e View commit details
    Browse the repository at this point in the history

  4. simplify evaluate in IsIn

    Moritz-Alexander-Kern committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    dd5ec83 View commit details
    Browse the repository at this point in the history

  5. further simplification of unit tests

    Moritz-Alexander-Kern committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    2407353 View commit details
    Browse the repository at this point in the history

  6. add typehints

    Moritz-Alexander-Kern committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    fd32d6a View commit details
    Browse the repository at this point in the history

  7. add docstring to unit test

    Moritz-Alexander-Kern committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    d655ac6 View commit details
    Browse the repository at this point in the history

  8. refactor naming for x to compare and z to control

    Moritz-Alexander-Kern committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    9c30bde View commit details
    Browse the repository at this point in the history

  9. fix typo and refactor filterdata

    Moritz-Alexander-Kern committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    dedfc1b View commit details
    Browse the repository at this point in the history