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

Concrete GridPandas #44

Merged
merged 46 commits into from
Aug 4, 2024
Merged

Concrete GridPandas #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
24ce034
adding __repr__ and __str__ to DiscreteDF
adamamer20 Jul 24, 2024
f3d5201
implement random_pos in DiscreteSpaceDF
adamamer20 Jul 24, 2024
6e86635
Changing set_cells docstring
adamamer20 Jul 24, 2024
ff812c9
adding _df_columns to mixin
adamamer20 Jul 24, 2024
8b049ee
add _df_column_names
adamamer20 Jul 24, 2024
c2218c6
- move capacity to DiscreteSpaceDF
adamamer20 Jul 24, 2024
6436186
adding _contains to mixin, changed _add_columns to _with_columns
adamamer20 Jul 24, 2024
0777041
- moved column names to SpaceDF
adamamer20 Jul 24, 2024
3e3f457
add _srs_range
adamamer20 Jul 24, 2024
00a5e1a
add _df_join to mixin
adamamer20 Jul 24, 2024
dee33f5
adding "cross" option to _df_join
adamamer20 Jul 24, 2024
fe2abfb
adding _df_filter_ to mixin
adamamer20 Jul 25, 2024
e47742c
add _df_rename_columns to DataFrameMixin
adamamer20 Jul 25, 2024
365b240
adding get_neighborhood to GridDF
adamamer20 Jul 25, 2024
16dfd5d
- remove _place_agents_df and move it to move_agents
adamamer20 Jul 25, 2024
49e5617
fix move update capacity first
adamamer20 Jul 25, 2024
de5aaf6
pandas implementation
adamamer20 Jul 25, 2024
6d185f4
move pandas, polars tests to their folders
adamamer20 Jul 25, 2024
46500a7
adding GridPandas to __init__
adamamer20 Jul 25, 2024
12bae83
adding remaining capacity
adamamer20 Jul 25, 2024
00cb4be
reorder mixin
adamamer20 Jul 25, 2024
71281cf
adding mixin_test for pandas
adamamer20 Jul 26, 2024
0363e67
fixes to abstract DataFrameMixin syntax
adamamer20 Jul 26, 2024
d26404e
updates to types
adamamer20 Jul 26, 2024
1794388
renamed files for pytest
adamamer20 Jul 26, 2024
499e4e2
adding typeguard to mixin
adamamer20 Jul 26, 2024
3943365
added series concatenation to DataFrameMixin
adamamer20 Jul 26, 2024
fd1b5f1
adding place_agents
adamamer20 Jul 26, 2024
91bc4aa
renaming test_agentsets (for pytest compatibility)
adamamer20 Jul 26, 2024
96307e6
added index as abstract property and changed inactive_agents mismatch…
adamamer20 Aug 1, 2024
b33d083
- changed index_col to index_cols across methods
adamamer20 Aug 1, 2024
5c07e53
- new methods in PandasMixin based on additions to DataFrameMixin
adamamer20 Aug 1, 2024
b43449c
- Distinction between place and move: the first raises Warning if age…
adamamer20 Aug 1, 2024
054ebf9
addition of the new methods to PolarsMixin according to the new abstr…
adamamer20 Aug 1, 2024
7e5bca4
- added index property to AgentsDF
adamamer20 Aug 1, 2024
e6e8f2a
- specified _copy_with_method attribute for fast copy through CopyMixin
adamamer20 Aug 1, 2024
2b181e7
added tests for GridPandas
adamamer20 Aug 1, 2024
34a6368
Merge branch 'main' of https://github.com/adamamer20/mesa-frames into…
adamamer20 Aug 1, 2024
2a2284e
Merge branch 'main' of https://github.com/adamamer20/mesa-frames into…
adamamer20 Aug 1, 2024
b166d66
Merge branch 'main' of https://github.com/adamamer20/mesa-frames into…
adamamer20 Aug 1, 2024
5106501
test_mixin_pandas will be added with it's own PR
adamamer20 Aug 1, 2024
e90cacd
moved test_space_pandas to pandas test folder and changed named to te…
adamamer20 Aug 1, 2024
5a33cba
Merge branch 'main' into 34-concrete-gridpandas
adamamer20 Aug 2, 2024
3cf1357
from absolute to relative import for build pytest
adamamer20 Aug 2, 2024
3566f6a
add __init__ to pandas and polars tests
adamamer20 Aug 2, 2024
0e0b9b9
Revert "from absolute to relative import for build pytest"
adamamer20 Aug 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion mesa_frames/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
from mesa_frames.concrete.agents import AgentsDF
from mesa_frames.concrete.model import ModelDF
from mesa_frames.concrete.pandas.agentset import AgentSetPandas
from mesa_frames.concrete.pandas.space import GridPandas
from mesa_frames.concrete.polars.agentset import AgentSetPolars
from mesa_frames.concrete.model import ModelDF

__all__ = [
"AgentsDF",
"AgentSetPandas",
"AgentSetPolars",
"ModelDF",
"GridPandas",
]
Loading