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

Concrete GridPandas #44

Merged
merged 46 commits into from
Aug 4, 2024
Merged

Concrete GridPandas #44

merged 46 commits into from
Aug 4, 2024

Commits on Jul 24, 2024

  1. adding __repr__ and __str__ to DiscreteDF

    @adamamer20
    adamamer20 committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    24ce034 View commit details
    Browse the repository at this point in the history

  2. implement random_pos in DiscreteSpaceDF

    @adamamer20
    adamamer20 committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    f3d5201 View commit details
    Browse the repository at this point in the history

  3. Changing set_cells docstring

    @adamamer20
    adamamer20 committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    6e86635 View commit details
    Browse the repository at this point in the history

  4. adding _df_columns to mixin

    @adamamer20
    adamamer20 committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    ff812c9 View commit details
    Browse the repository at this point in the history

  5. add _df_column_names

    @adamamer20
    adamamer20 committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    8b049ee View commit details
    Browse the repository at this point in the history

  6. - move capacity to DiscreteSpaceDF 

    - create set_cells at DiscreteSpaceDF level
    @adamamer20
    adamamer20 committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    c2218c6 View commit details
    Browse the repository at this point in the history

  7. adding _contains to mixin, changed _add_columns to _with_columns

    @adamamer20
    adamamer20 committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    6436186 View commit details
    Browse the repository at this point in the history

  8. - moved column names to SpaceDF 

    - created concrete swap in SpaceDF
- update due to changes in mixin
    @adamamer20
    adamamer20 committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    0777041 View commit details
    Browse the repository at this point in the history

  9. add _srs_range

    @adamamer20
    adamamer20 committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    3e3f457 View commit details
    Browse the repository at this point in the history

  10. add _df_join to mixin

    @adamamer20
    adamamer20 committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    00a5e1a View commit details
    Browse the repository at this point in the history

  11. adding "cross" option to _df_join

    @adamamer20
    adamamer20 committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    dee33f5 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2024

  1. adding _df_filter_ to mixin

    @adamamer20
    adamamer20 committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    fe2abfb View commit details
    Browse the repository at this point in the history

  2. add _df_rename_columns to DataFrameMixin

    @adamamer20
    adamamer20 committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    e47742c View commit details
    Browse the repository at this point in the history

  3. adding get_neighborhood to GridDF

    @adamamer20
    adamamer20 committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    365b240 View commit details
    Browse the repository at this point in the history

  4. - remove _place_agents_df and move it to move_agents 

    - add remaining capacity property
- branching _update_capacity in cells and agents
    @adamamer20
    adamamer20 committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    16dfd5d View commit details
    Browse the repository at this point in the history

  5. fix move update capacity first

    @adamamer20
    adamamer20 committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    49e5617 View commit details
    Browse the repository at this point in the history

  6. pandas implementation

    @adamamer20
    adamamer20 committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    de5aaf6 View commit details
    Browse the repository at this point in the history

  7. move pandas, polars tests to their folders

    @adamamer20
    adamamer20 committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    6d185f4 View commit details
    Browse the repository at this point in the history

  8. adding GridPandas to __init__

    @adamamer20
    adamamer20 committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    46500a7 View commit details
    Browse the repository at this point in the history

  9. adding remaining capacity

    @adamamer20
    adamamer20 committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    12bae83 View commit details
    Browse the repository at this point in the history

  10. reorder mixin

    @adamamer20
    adamamer20 committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    00cb4be View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2024

  1. adding mixin_test for pandas

    @adamamer20
    adamamer20 committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    71281cf View commit details
    Browse the repository at this point in the history

  2. fixes to abstract DataFrameMixin syntax

    @adamamer20
    adamamer20 committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    0363e67 View commit details
    Browse the repository at this point in the history

  3. updates to types

    @adamamer20
    adamamer20 committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    d26404e View commit details
    Browse the repository at this point in the history

  4. renamed files for pytest

    @adamamer20
    adamamer20 committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    1794388 View commit details
    Browse the repository at this point in the history

  5. adding typeguard to mixin

    @adamamer20
    adamamer20 committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    499e4e2 View commit details
    Browse the repository at this point in the history

  6. added series concatenation to DataFrameMixin

    @adamamer20
    adamamer20 committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    3943365 View commit details
    Browse the repository at this point in the history

  7. adding place_agents

    @adamamer20
    adamamer20 committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    fd1b5f1 View commit details
    Browse the repository at this point in the history

  8. renaming test_agentsets (for pytest compatibility)

    @adamamer20
    adamamer20 committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    91bc4aa View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2024

  1. added index as abstract property and changed inactive_agents mismatch… 

    …ed return type
    @adamamer20
    adamamer20 committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    96307e6 View commit details
    Browse the repository at this point in the history

  2. - changed index_col to index_cols across methods 

    - added some useful method (add, all, div, drop_columns, drop_duplicates, group_by_cum_count, mul, norm, reset_index, set_index, srs_to_df)
- minor fixes
    @adamamer20
    adamamer20 committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    b33d083 View commit details
    Browse the repository at this point in the history

  3. - new methods in PandasMixin based on additions to DataFrameMixin 

    - fixes to the logic of some methods
    @adamamer20
    adamamer20 committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    5c07e53 View commit details
    Browse the repository at this point in the history

  4. - Distinction between place and move: the first raises Warning if age… 

    …nts are already present, the second if agents aren't already present

- Fixes to the logic of some methods of SpaceDF (random_agents, swap_agents),
DiscreteSpaceDF (__repr__, __str__)
GridDF (__init__, get_directions, get_distances, get_neighbors, get_neighborhood, get_cells, out_of_bounds, remove_agents, torus_adj, _compute_offsets, _get_df_coords)
    @adamamer20
    adamamer20 committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    b43449c View commit details
    Browse the repository at this point in the history

  5. addition of the new methods to PolarsMixin according to the new abstr… 

    …act DataFrameMixin
    @adamamer20
    adamamer20 committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    054ebf9 View commit details
    Browse the repository at this point in the history

  6. - added index property to AgentsDF

    @adamamer20
    adamamer20 committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    7e5bca4 View commit details
    Browse the repository at this point in the history

  7. - specified _copy_with_method attribute for fast copy through CopyMixin 

    - added custom _empty_cell_condition
- fixed the logic of some methods (_generate_empty_grid, _sample_cells, _update_capacity_agents, remaining_capacity)
    @adamamer20
    adamamer20 committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    e6e8f2a View commit details
    Browse the repository at this point in the history

  8. added tests for GridPandas

    @adamamer20
    adamamer20 committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    2b181e7 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'main' of https://github.com/adamamer20/mesa-frames into… 

    … 34-concrete-gridpandas
    @adamamer20
    adamamer20 committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    34a6368 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'main' of https://github.com/adamamer20/mesa-frames into… 

    … 34-concrete-gridpandas
    @adamamer20
    adamamer20 committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    2a2284e View commit details
    Browse the repository at this point in the history

  11. Merge branch 'main' of https://github.com/adamamer20/mesa-frames into… 

    … 34-concrete-gridpandas
    @adamamer20
    adamamer20 committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    b166d66 View commit details
    Browse the repository at this point in the history

  12. test_mixin_pandas will be added with it's own PR

    @adamamer20
    adamamer20 committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    5106501 View commit details
    Browse the repository at this point in the history

  13. moved test_space_pandas to pandas test folder and changed named to te… 

    …st_grid_pandas
    @adamamer20
    adamamer20 committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    e90cacd View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2024

  1. Merge branch 'main' into 34-concrete-gridpandas

    @adamamer20
    adamamer20 committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    5a33cba View commit details
    Browse the repository at this point in the history

  2. from absolute to relative import for build pytest

    @adamamer20
    adamamer20 committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    3cf1357 View commit details
    Browse the repository at this point in the history

  3. add __init__ to pandas and polars tests

    @adamamer20
    adamamer20 committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    3566f6a View commit details
    Browse the repository at this point in the history

  4. Revert "from absolute to relative import for build pytest" 

    This reverts commit 3cf1357.
    @adamamer20
    adamamer20 committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    0e0b9b9 View commit details
    Browse the repository at this point in the history