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.

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

Move images from docs to docs/general to make it available for mkdocs #79

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
File renamed without changes
File renamed without changes
2 changes: 1 addition & 1 deletion mesa_frames/concrete/pandas/mixin.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down