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

Add cell-centric discrete spaces (experimental) #1994

Merged
merged 74 commits into from
Feb 27, 2024
Merged

Add cell-centric discrete spaces (experimental) #1994

merged 74 commits into from
Feb 27, 2024

Commits on Jan 23, 2024

  1. Add draft implementation for CellSpace

    @Corvince
    Corvince committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    dd54f21 View commit details
    Browse the repository at this point in the history

  2. add features to cell

    @Corvince
    Corvince committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    7b58d8e View commit details
    Browse the repository at this point in the history

  3. remove create_neighborhood_getter

    @Corvince
    Corvince committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    aef4a8b View commit details
    Browse the repository at this point in the history

  4. update benchmark models

    @Corvince
    Corvince committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    3240a2b View commit details
    Browse the repository at this point in the history

  5. try to import Grid directly from experimental

    @Corvince
    Corvince committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    d3df44e View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2024

  1. adds a pythonic WolfSheep implementation

    @quaquel
    quaquel committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    c80a0bd View commit details
    Browse the repository at this point in the history

  2. replace radius check with value error in neighborhood 

    the recursion will never call with radius 0, because if radius is 1 you return a cellcollection rather than calling the content of the collection
    @quaquel
    quaquel committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    93d7db5 View commit details
    Browse the repository at this point in the history

  3. minor further code cleanup of wolfsheep

    @quaquel
    quaquel committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    be7b843 View commit details
    Browse the repository at this point in the history

  4. add HexGrid

    @quaquel
    quaquel committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    bd788ec View commit details
    Browse the repository at this point in the history

  5. typo fix

    @quaquel
    quaquel committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    cb0ef18 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2024

  1. various updates 

    * add cell agen
* add move_to method to CellAgent
* rename to space to discrete space
* placeholder for random
* revert agent in agent.py back to old version to isolate experimental features
    @quaquel
    quaquel committed Jan 27, 2024
    Configuration menu
    Copy the full SHA
    94f06b1 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/main' into experimental/cell-s… 

    …pace
    @quaquel
    quaquel committed Jan 27, 2024
    Configuration menu
    Copy the full SHA
    be6c1af View commit details
    Browse the repository at this point in the history

  3. add NetworkGrid

    @quaquel
    quaquel committed Jan 27, 2024
    Configuration menu
    Copy the full SHA
    875d0ed View commit details
    Browse the repository at this point in the history

  4. add NetworkGrid

    @quaquel
    quaquel committed Jan 27, 2024
    Configuration menu
    Copy the full SHA
    e4d121d View commit details
    Browse the repository at this point in the history

  5. change how empties is handled

    @quaquel
    quaquel committed Jan 27, 2024
    Configuration menu
    Copy the full SHA
    5769a05 View commit details
    Browse the repository at this point in the history

  6. further cleanup of handling of empties 

    adds a new intermediate Grid class from which both OrthogonalGrid and HexGrid derive.
    @quaquel
    quaquel committed Jan 27, 2024
    Configuration menu
    Copy the full SHA
    82a64d9 View commit details
    Browse the repository at this point in the history

  7. correct handling of radius in Schelling large

    @quaquel
    quaquel committed Jan 27, 2024
    Configuration menu
    Copy the full SHA
    5fdc787 View commit details
    Browse the repository at this point in the history

  8. [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 27, 2024
    Configuration menu
    Copy the full SHA
    152995c View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2024

  1. Merge remote-tracking branch 'upstream/main' into experimental/cell-s… 

    …pace
    @quaquel
    quaquel committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    c524034 View commit details
    Browse the repository at this point in the history

  2. Update cell_space.py

    @quaquel
    quaquel committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    972ecc4 View commit details
    Browse the repository at this point in the history

  3. change from Random to random 

    This is a temporary fix. All random number generation for now uses the default rng from random.
    @quaquel
    quaquel committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    a656d93 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 Jan 28, 2024
    Configuration menu
    Copy the full SHA
    8df9276 View commit details
    Browse the repository at this point in the history

  5. small fixes and default capacity=None

    @Corvince
    Corvince committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    f4a1089 View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2024

  1. initial tests for cell_space

    @quaquel
    quaquel committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    1ebcf06 View commit details
    Browse the repository at this point in the history

  2. some additional tests

    @quaquel
    quaquel committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    d362bae View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2024

  1. additional unit tests

    @quaquel
    quaquel committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    c7d82d0 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2024

  1. restructure files and folders

    @Corvince
    Corvince committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    b2842c0 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2024

  1. various updates 

    * new tests
* pass through of random keyword argument
* add CellKlass as an optional keyword argument
    @quaquel
    quaquel committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    740f003 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2024

  1. additional tests and temporary fix for select_random_empty_cell

    @quaquel
    quaquel committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    2d8fcb5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into experimental/cell-space

    @quaquel
    quaquel committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    99ff668 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 Feb 9, 2024
    Configuration menu
    Copy the full SHA
    565ae0a View commit details
    Browse the repository at this point in the history

  4. improved annotations

    @quaquel
    quaquel committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    ab87b70 View commit details
    Browse the repository at this point in the history

  5. [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 Feb 9, 2024
    Configuration menu
    Copy the full SHA
    ab13bbc View commit details
    Browse the repository at this point in the history

  6. Update discrete_space.py

    @quaquel
    quaquel committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    8f2e3dd View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2024

  1. Merge branch 'experimental/cell-space' of https://github.com/Corvince… 

    …/mesa into experimental/cell-space
    @quaquel
    quaquel committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    ac8ff31 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 Feb 15, 2024
    Configuration menu
    Copy the full SHA
    aa03962 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2024

  1. correct handling of seeds when running examples in issolation

    @quaquel
    quaquel committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    9b28f9d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'experimental/cell-space' of https://github.com/Corvince… 

    …/mesa into experimental/cell-space
    @quaquel
    quaquel committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    bbca3ac 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 Feb 16, 2024
    Configuration menu
    Copy the full SHA
    fe5a93f View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2024

  1. added docstrings

    @quaquel
    quaquel committed Feb 17, 2024
    Configuration menu
    Copy the full SHA
    2c80330 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 Feb 17, 2024
    Configuration menu
    Copy the full SHA
    c79aaf0 View commit details
    Browse the repository at this point in the history

  3. reformating and minor update to tests

    @quaquel
    quaquel committed Feb 17, 2024
    Configuration menu
    Copy the full SHA
    8384cf1 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'experimental/cell-space' of https://github.com/Corvince… 

    …/mesa into experimental/cell-space
    @quaquel
    quaquel committed Feb 17, 2024
    Configuration menu
    Copy the full SHA
    253531c View commit details
    Browse the repository at this point in the history

  5. Add optional neighborhood_func to Grid class

    @Corvince
    Corvince committed Feb 17, 2024
    Configuration menu
    Copy the full SHA
    ebdee8e View commit details
    Browse the repository at this point in the history

  6. allow n-dimensional grids

    @Corvince
    Corvince committed Feb 17, 2024
    Configuration menu
    Copy the full SHA
    bb2fc52 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 Feb 17, 2024
    Configuration menu
    Copy the full SHA
    b3efdee View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2024

  1. add validation, remove neighborhood_func, add tests

    @Corvince
    Corvince committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    8c7ad05 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 Feb 18, 2024
    Configuration menu
    Copy the full SHA
    819e903 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2024

  1. Make Cell* generic

    @Corvince
    Corvince committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    0f49dc7 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 Feb 19, 2024
    Configuration menu
    Copy the full SHA
    da94fb1 View commit details
    Browse the repository at this point in the history

  3. Make Cell* generic

    @Corvince
    Corvince committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    b210686 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 Feb 19, 2024
    Configuration menu
    Copy the full SHA
    c35591c View commit details
    Browse the repository at this point in the history

  5. fixes to tests

    @quaquel
    quaquel committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    065e5ea View commit details
    Browse the repository at this point in the history

  6. [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 Feb 19, 2024
    Configuration menu
    Copy the full SHA
    1bfa009 View commit details
    Browse the repository at this point in the history

  7. type hint 3.9 fix in network.py

    @quaquel
    quaquel committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    6b1c454 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'experimental/cell-space' of https://github.com/Corvince… 

    …/mesa into experimental/cell-space
    @quaquel
    quaquel committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    e0d5673 View commit details
    Browse the repository at this point in the history

  9. fix type checking

    @Corvince
    Corvince committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    cf789f2 View commit details
    Browse the repository at this point in the history

  10. update capacity, add annotations import

    @Corvince
    Corvince committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    50666c1 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2024

  1. fix wolf_sheep

    @Corvince
    Corvince committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    e520d3c 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 Feb 20, 2024
    Configuration menu
    Copy the full SHA
    85251f0 View commit details
    Browse the repository at this point in the history

  3. fix wolf_sheep

    @Corvince
    Corvince committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    3a247cb View commit details
    Browse the repository at this point in the history

  4. Merge branch 'experimental/cell-space' of https://github.com/Corvince… 

    …/mesa into experimental/cell-space
    @quaquel
    quaquel committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    86127f2 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2024

  1. seperate code path for 2d and nd grids when connecting cells

    @quaquel
    quaquel committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    fb19879 View commit details
    Browse the repository at this point in the history

  2. seed as kwarg

    @quaquel
    quaquel committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    5ea5d35 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 Feb 21, 2024
    Configuration menu
    Copy the full SHA
    b7ac86c View commit details
    Browse the repository at this point in the history

  4. code formatting fix

    @quaquel
    quaquel committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    76ca4a5 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2024

  1. testing

    @quaquel
    quaquel committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    45e3e9f 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 Feb 22, 2024
    Configuration menu
    Copy the full SHA
    3d8cdfd View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into experimental/cell-space

    @quaquel
    quaquel committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    ce8ca0b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'experimental/cell-space' of https://github.com/Corvince… 

    …/mesa into experimental/cell-space
    @quaquel
    quaquel committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    18bd2a3 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2024

  1. minor docstring update

    @quaquel
    quaquel committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    62c844e 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 Feb 23, 2024
    Configuration menu
    Copy the full SHA
    adff7aa View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2024

  1. Merge branch 'main' into experimental/cell-space

    @EwoutH
    EwoutH authored Feb 27, 2024
    Configuration menu
    Copy the full SHA
    7d5e6b0 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 Feb 27, 2024
    Configuration menu
    Copy the full SHA
    b32af9f View commit details
    Browse the repository at this point in the history