merge experimental schelling into schelling example

Author: wang-boyu

examples/basic/schelling/README.md

@@ -16,21 +16,13 @@ To install the dependencies use pip and the requirements.txt in this directory.
 
 ## How to Run
 
-To run the model interactively, run ``mesa runserver`` in this directory. e.g.
+To run the model interactively, in this directory, run the following command
 
 ```
-    $ mesa runserver
+    $ solara run app.py
 ```
 
-or
-
-Directly run the file ``run.py`` in the terminal. e.g.
-
-```
-    $ python run.py
-```
-
-Then open your browser to [http://127.0.0.1:8521/](http://127.0.0.1:8521/) and press Reset, then Run.
+Then open your browser to [http://127.0.0.1:8765/](http://127.0.0.1:8765/) and click the Play button.
 
 To view and run some example model analyses, launch the IPython Notebook and open ``analysis.ipynb``. Visualizing the analysis also requires [matplotlib](http://matplotlib.org/).
 
@@ -40,10 +32,9 @@ To run the model with the grid displayed as an ASCII text, run `python run_ascii
 
 ## Files
 
-* ``run.py``: Launches a model visualization server.
+* ``app.py``: Code for the interactive visualization.
 * ``run_ascii.py``: Run the model in text mode.
 * ``schelling.py``: Contains the agent class, and the overall model class.
-* ``server.py``: Defines classes for visualizing the model in the browser via Mesa's modular server, and instantiates a visualization server.
 * ``analysis.ipynb``: Notebook demonstrating how to run experiments and parameter sweeps on the model.
 
 ## Further Reading

examples/basic/schelling/app.py

@@ -0,0 +1,43 @@
+import solara
+from mesa.visualization import (
+    Slider,
+    SolaraViz,
+    make_plot_measure,
+    make_space_matplotlib,
+)
+from model import Schelling
+
+
+def get_happy_agents(model):
+    """
+    Display a text count of how many happy agents there are.
+    """
+    return solara.Markdown(f"**Happy agents: {model.happy}**")
+
+
+def agent_portrayal(agent):
+    return {"color": "tab:orange" if agent.type == 0 else "tab:blue"}
+
+
+model_params = {
+    "density": Slider("Agent density", 0.8, 0.1, 1.0, 0.1),
+    "minority_pc": Slider("Fraction minority", 0.2, 0.0, 1.0, 0.05),
+    "homophily": Slider("Homophily", 3, 0, 8, 1),
+    "width": 20,
+    "height": 20,
+}
+
+model1 = Schelling(20, 20, 0.8, 0.2, 3)
+
+HappyPlot = make_plot_measure("happy")
+
+page = SolaraViz(
+    model1,
+    components=[
+        make_space_matplotlib(agent_portrayal),
+        make_plot_measure("happy"),
+        get_happy_agents,
+    ],
+    model_params=model_params,
+)
+page  # noqa

examples/basic/schelling/requirements.txt

@@ -1,3 +1,3 @@
 jupyter
 matplotlib
-mesa~=2.0
+mesa[viz]>=3.0.0b0