From 914d96ce967b2343ef4d291c8ff08425847bda28 Mon Sep 17 00:00:00 2001 From: Adam Amer <136176500+adamamer20@users.noreply.github.com> Date: Sun, 25 Aug 2024 17:03:49 +0200 Subject: [PATCH 1/3] moving images to docs/general folder --- docs/{ => general}/images/readme_plot_0.png | Bin docs/{ => general}/images/readme_plot_1.png | Bin 2 files changed, 0 insertions(+), 0 deletions(-) rename docs/{ => general}/images/readme_plot_0.png (100%) rename docs/{ => general}/images/readme_plot_1.png (100%) diff --git a/docs/images/readme_plot_0.png b/docs/general/images/readme_plot_0.png similarity index 100% rename from docs/images/readme_plot_0.png rename to docs/general/images/readme_plot_0.png diff --git a/docs/images/readme_plot_1.png b/docs/general/images/readme_plot_1.png similarity index 100% rename from docs/images/readme_plot_1.png rename to docs/general/images/readme_plot_1.png From 394e1df5f811db3c26dbd305e3e6649bb4047982 Mon Sep 17 00:00:00 2001 From: Adam Amer <136176500+adamamer20@users.noreply.github.com> Date: Sun, 25 Aug 2024 17:04:26 +0200 Subject: [PATCH 2/3] changing path in README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 562d7b4..c9368db 100644 --- a/README.md +++ b/README.md @@ -11,9 +11,9 @@ DataFrames are optimized for simultaneous operations through [SIMD processing](h The following is a performance graph showing execution time using mesa and mesa-frames for the [Boltzmann Wealth model](https://mesa.readthedocs.io/en/stable/tutorials/intro_tutorial.html). -![Performance Graph](https://github.com/adamamer20/mesa_frames/blob/main/docs/images/readme_plot_0.png) +![Performance Graph](https://github.com/adamamer20/mesa_frames/blob/main/docs/general/images/readme_plot_0.png) -![Performance Graph without Mesa](https://github.com/adamamer20/mesa_frames/blob/main/docs/images/readme_plot_1.png) +![Performance Graph without Mesa](https://github.com/adamamer20/mesa_frames/blob/main/docs/general/images/readme_plot_1.png) (The script used to generate the graph can be found [here](https://github.com/adamamer20/mesa_frames/blob/main/docs/scripts/readme_plot.py), but if you want to additionally compare vs Mesa, you have to uncomment `mesa_implementation` and its label) From b351dd0a281e2faa99ee2fca7ea70233f257dbd5 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sun, 25 Aug 2024 15:05:22 +0000 Subject: [PATCH 3/3] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- mesa_frames/concrete/pandas/mixin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesa_frames/concrete/pandas/mixin.py b/mesa_frames/concrete/pandas/mixin.py index c6eeeff..7ac9cc5 100644 --- a/mesa_frames/concrete/pandas/mixin.py +++ b/mesa_frames/concrete/pandas/mixin.py @@ -316,7 +316,7 @@ def _prepare_df(df: pd.DataFrame, on: str | list[str] | None) -> pd.DataFrame: # Reset index if it is not used as a key to keep it in the DataFrame if df.index.name is not None or df.index.names[0] is not None: df = df.reset_index() - df = df.set_index(on) + df = df.set_index(on) return df left_index = False