simulatingrisk 1.1.0.dev0__tar.gz → 1.1.0.dev1__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (84) hide show
  1. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/PKG-INFO +2 -10
  2. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/README.md +0 -8
  3. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/pyproject.toml +1 -2
  4. simulatingrisk-1.1.0.dev1/simulatingrisk/__init__.py +1 -0
  5. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk/hawkdove/server.py +4 -2
  6. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk.egg-info/PKG-INFO +2 -10
  7. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk.egg-info/requires.txt +1 -1
  8. simulatingrisk-1.1.0.dev0/simulatingrisk/__init__.py +0 -1
  9. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/.github/workflows/unit_tests.yml +0 -0
  10. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/.gitignore +0 -0
  11. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/.pre-commit-config.yaml +0 -0
  12. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/LICENSE +0 -0
  13. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/docs/index.html +0 -0
  14. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/docs/notebooks/hawkdovemulti-adjust/hdm_analysis.html +0 -0
  15. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/docs/notebooks/hawkdovemulti-adjust/hdm_c7_hawkodds.html +0 -0
  16. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/docs/notebooks/hawkdovemulti-adjust/hdm_c7_riskdistribution.html +0 -0
  17. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/docs/notebooks/hawkdovemulti-adjust/hdm_convergence_runlength.html +0 -0
  18. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/docs/notebooks/hawkdovemulti-adjust/hdm_riskadjust_runlength.html +0 -0
  19. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/docs/notebooks/hawkdovemulti-adjust/index.html +0 -0
  20. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/docs/notebooks/hawkdovemulti-adjust/parameter_analysis.html +0 -0
  21. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/docs/notebooks/hawkdovemulti-noadjust/index.html +0 -0
  22. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/docs/notebooks/index.html +0 -0
  23. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/docs/simulatingrisk-0.1.0.dev0-py3-none-any.whl +0 -0
  24. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/notebooks/README.md +0 -0
  25. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/notebooks/hawkdove_single_r/hawkdove_single_r_analysis.ipynb +0 -0
  26. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/notebooks/hawkdovemulti_adjust/hawkdovemulti_agentrisktotals.ipynb +0 -0
  27. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/notebooks/hawkdovemulti_adjust/hawkdovemulti_polars.ipynb +0 -0
  28. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/notebooks/hawkdovemulti_adjust/hawkdovemulti_runlength.ipynb +0 -0
  29. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/notebooks/hawkdovemulti_adjust/hawkdovevar_population_risk_category.ipynb +0 -0
  30. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/notebooks/hawkdovemulti_adjust/hdm_analysis.ipynb +0 -0
  31. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/notebooks/hawkdovemulti_adjust/hdm_c7_hawkodds.ipynb +0 -0
  32. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/notebooks/hawkdovemulti_adjust/hdm_c7_riskdistribution.ipynb +0 -0
  33. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/notebooks/hawkdovemulti_adjust/hdm_riskadjust_runlength.ipynb +0 -0
  34. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/notebooks/hawkdovemulti_noadjust/analyze_batchrun_data.ipynb +0 -0
  35. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/notebooks/hawkdovemulti_noadjust/hawkdove_variable_r_analysis.ipynb +0 -0
  36. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/notebooks/new_convergence/hdm_convergence_runlength.ipynb +0 -0
  37. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/notebooks/riskybet/riskybet_batch_analysis.ipynb +0 -0
  38. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/notebooks/riskybet/riskybet_simulation.ipynb +0 -0
  39. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/notebooks/riskyfood/riskyfood_batch_analysis.ipynb +0 -0
  40. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/notebooks/riskyfood/riskyfood_simulation.ipynb +0 -0
  41. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/postBuild +0 -0
  42. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/setup.cfg +0 -0
  43. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk/about_app.md +0 -0
  44. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk/app.py +0 -0
  45. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk/batch_run.py +0 -0
  46. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk/charts/histogram.js +0 -0
  47. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk/charts/histogram.py +0 -0
  48. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk/hawkdove/README.md +0 -0
  49. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk/hawkdove/app.py +0 -0
  50. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk/hawkdove/model.py +0 -0
  51. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk/hawkdove/run.py +0 -0
  52. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk/hawkdovemulti/README.md +0 -0
  53. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk/hawkdovemulti/analysis_utils.py +0 -0
  54. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk/hawkdovemulti/app.py +0 -0
  55. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk/hawkdovemulti/batch_run.py +0 -0
  56. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk/hawkdovemulti/model.py +0 -0
  57. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk/hawkdovemulti/run_simulation.ipynb +0 -0
  58. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk/hawkdovemulti/simrisk_batch.slurm +0 -0
  59. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk/risky_bet/README.md +0 -0
  60. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk/risky_bet/app.py +0 -0
  61. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk/risky_bet/model.py +0 -0
  62. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk/risky_bet/run.py +0 -0
  63. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk/risky_bet/server.py +0 -0
  64. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk/risky_food/README.md +0 -0
  65. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk/risky_food/__init__.py +0 -0
  66. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk/risky_food/app.py +0 -0
  67. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk/risky_food/model.py +0 -0
  68. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk/risky_food/run.py +0 -0
  69. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk/risky_food/server.py +0 -0
  70. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk/stag_hunt/README.md +0 -0
  71. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk/stag_hunt/__init__.py +0 -0
  72. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk/stag_hunt/model.py +0 -0
  73. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk/stag_hunt/run.py +0 -0
  74. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk/utils.py +0 -0
  75. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk.egg-info/SOURCES.txt +0 -0
  76. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk.egg-info/dependency_links.txt +0 -0
  77. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk.egg-info/entry_points.txt +0 -0
  78. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk.egg-info/top_level.txt +0 -0
  79. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/tests/test_batch_run.py +0 -0
  80. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/tests/test_hawkdove.py +0 -0
  81. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/tests/test_hawkdovemulti.py +0 -0
  82. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/tests/test_risky_bet.py +0 -0
  83. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/tests/test_risky_food.py +0 -0
  84. {simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/tests/test_utils.py +0 -0
{simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: simulatingrisk
3
- Version: 1.1.0.dev0
3
+ Version: 1.1.0.dev1
4
4
  Summary: Agent-based modeling for simulations related to risk and rationality
5
5
  License: Apache-2
6
6
  Classifier: Programming Language :: Python :: 3
@@ -9,7 +9,7 @@ Description-Content-Type: text/markdown
9
9
  License-File: LICENSE
10
10
  Requires-Dist: mesa==2.1.5
11
11
  Requires-Dist: matplotlib
12
- Requires-Dist: altair>=6.1.0
12
+ Requires-Dist: altair<6.0,>=5.5.0
13
13
  Provides-Extra: dev
14
14
  Requires-Dist: pre-commit; extra == "dev"
15
15
  Requires-Dist: pytest; extra == "dev"
@@ -128,11 +128,3 @@ Install pre-commit hooks (currently [black](https://github.com/psf/black) and [r
128
128
  ```sh
129
129
  pre-commit install
130
130
  ```
131
-
132
- ### To run on py.cafe
133
-
134
- Build the application as a wheel, excluding dependencies:
135
-
136
- ```sh
137
- pip wheel . --no-deps
138
- ```
{simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/README.md RENAMED
@@ -99,11 +99,3 @@ Install pre-commit hooks (currently [black](https://github.com/psf/black) and [r
99
99
  ```sh
100
100
  pre-commit install
101
101
  ```
102
-
103
- ### To run on py.cafe
104
-
105
- Build the application as a wheel, excluding dependencies:
106
-
107
- ```sh
108
- pip wheel . --no-deps
109
- ```
{simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/pyproject.toml RENAMED
@@ -14,8 +14,7 @@ dependencies = [
14
14
  "mesa==2.1.5",
15
15
  # "mesa @ git+https://github.com/projectmesa/mesa.git@main",
16
16
  "matplotlib", # required by mesa
17
- "altair>=6.1.0",
18
-
17
+ "altair<6.0,>=5.5.0" # 6.1 not compatible with mesa/solara version
19
18
  ]
20
19
  dynamic = ["version", "readme"]
21
20
 
simulatingrisk-1.1.0.dev1/simulatingrisk/__init__.py ADDED
@@ -0,0 +1 @@
1
+ __version__ = "1.1.0.dev1"
{simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk/hawkdove/server.py RENAMED
@@ -152,7 +152,7 @@ def draw_hawkdove_agent_space(model, agent_portrayal):
152
152
  )
153
153
  elif model.risk_attitudes == "single":
154
154
  chart_color = (
155
- alt.Color("choice", title="Choice")
155
+ alt.Color("choice", title="Play Choice")
156
156
  # .legend(None)
157
157
  .scale(domain=hawkdove_domain, range=["orange", "blue"])
158
158
  )
@@ -179,7 +179,9 @@ def draw_hawkdove_agent_space(model, agent_portrayal):
179
179
  fill=chart_color,
180
180
  color=outer_color,
181
181
  shape=alt.Shape( # use shape to indicate choice
182
- "choice", scale=alt.Scale(domain=hawkdove_domain, range=shape_range)
182
+ "choice",
183
+ title="Play Choice",
184
+ scale=alt.Scale(domain=hawkdove_domain, range=shape_range),
183
185
  ),
184
186
  )
185
187
  .configure_view(strokeOpacity=0) # hide grid/chart lines
{simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk.egg-info/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: simulatingrisk
3
- Version: 1.1.0.dev0
3
+ Version: 1.1.0.dev1
4
4
  Summary: Agent-based modeling for simulations related to risk and rationality
5
5
  License: Apache-2
6
6
  Classifier: Programming Language :: Python :: 3
@@ -9,7 +9,7 @@ Description-Content-Type: text/markdown
9
9
  License-File: LICENSE
10
10
  Requires-Dist: mesa==2.1.5
11
11
  Requires-Dist: matplotlib
12
- Requires-Dist: altair>=6.1.0
12
+ Requires-Dist: altair<6.0,>=5.5.0
13
13
  Provides-Extra: dev
14
14
  Requires-Dist: pre-commit; extra == "dev"
15
15
  Requires-Dist: pytest; extra == "dev"
@@ -128,11 +128,3 @@ Install pre-commit hooks (currently [black](https://github.com/psf/black) and [r
128
128
  ```sh
129
129
  pre-commit install
130
130
  ```
131
-
132
- ### To run on py.cafe
133
-
134
- Build the application as a wheel, excluding dependencies:
135
-
136
- ```sh
137
- pip wheel . --no-deps
138
- ```
{simulatingrisk-1.1.0.dev0 → simulatingrisk-1.1.0.dev1}/simulatingrisk.egg-info/requires.txt RENAMED
@@ -1,6 +1,6 @@
1
1
  mesa==2.1.5
2
2
  matplotlib
3
- altair>=6.1.0
3
+ altair<6.0,>=5.5.0
4
4
 
5
5
  [analysis]
6
6
  jupyterlab
simulatingrisk-1.1.0.dev0/simulatingrisk/__init__.py DELETED
@@ -1 +0,0 @@
1
- __version__ = "1.1.0.dev0"