Skip to content

Commit 492920f

Browse files
amyheatheramyheather
committed
build(sim-tools): upgrade to 0.10.0, and re-run, which alters results due to new sort=True argument in create_batch()
1 parent 2a2e018 commit 492920f

16 files changed

+2795
-3245
lines changed

‎environment.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ dependencies:
2020
- simpy=4.1.1
2121
- pip:
2222
- kaleido==1.0.0
23-
- sim-tools==0.9.1
23+
- sim-tools==0.10.0
2424
- -e .[dev]

‎notebooks/analysis.ipynb‎

Lines changed: 388 additions & 358 deletions
Large diffs are not rendered by default.

‎notebooks/generate_exp_results.ipynb‎

Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -93,43 +93,43 @@
9393
" <th>0</th>\n",
9494
" <td>1095</td>\n",
9595
" <td>8</td>\n",
96-
" <td>13</td>\n",
96+
" <td>16</td>\n",
9797
" </tr>\n",
9898
" <tr>\n",
9999
" <th>1</th>\n",
100100
" <td>1096</td>\n",
101101
" <td>7</td>\n",
102-
" <td>14</td>\n",
102+
" <td>16</td>\n",
103103
" </tr>\n",
104104
" <tr>\n",
105105
" <th>2</th>\n",
106106
" <td>1097</td>\n",
107-
" <td>8</td>\n",
108-
" <td>14</td>\n",
107+
" <td>5</td>\n",
108+
" <td>16</td>\n",
109109
" </tr>\n",
110110
" <tr>\n",
111111
" <th>3</th>\n",
112112
" <td>1098</td>\n",
113-
" <td>8</td>\n",
114-
" <td>14</td>\n",
113+
" <td>3</td>\n",
114+
" <td>15</td>\n",
115115
" </tr>\n",
116116
" <tr>\n",
117117
" <th>4</th>\n",
118118
" <td>1099</td>\n",
119-
" <td>8</td>\n",
120-
" <td>14</td>\n",
119+
" <td>6</td>\n",
120+
" <td>15</td>\n",
121121
" </tr>\n",
122122
" </tbody>\n",
123123
"</table>\n",
124124
"</div>"
125125
],
126126
"text/plain": [
127127
" time asu_occupancy rehab_occupancy\n",
128-
"0 1095 8 13\n",
129-
"1 1096 7 14\n",
130-
"2 1097 8 14\n",
131-
"3 1098 8 14\n",
132-
"4 1099 8 14"
128+
"0 1095 8 16\n",
129+
"1 1096 7 16\n",
130+
"2 1097 5 16\n",
131+
"3 1098 3 15\n",
132+
"4 1099 6 15"
133133
]
134134
},
135135
"metadata": {},
@@ -203,37 +203,37 @@
203203
" <tr>\n",
204204
" <th>1</th>\n",
205205
" <td>2</td>\n",
206-
" <td>12</td>\n",
207-
" <td>0.006575</td>\n",
206+
" <td>14</td>\n",
208207
" <td>0.007671</td>\n",
209-
" <td>0.857143</td>\n",
208+
" <td>0.008767</td>\n",
209+
" <td>0.875000</td>\n",
210210
" <td>1.0</td>\n",
211211
" </tr>\n",
212212
" <tr>\n",
213213
" <th>2</th>\n",
214214
" <td>3</td>\n",
215-
" <td>57</td>\n",
216-
" <td>0.031233</td>\n",
217-
" <td>0.038904</td>\n",
218-
" <td>0.802817</td>\n",
215+
" <td>72</td>\n",
216+
" <td>0.039452</td>\n",
217+
" <td>0.048219</td>\n",
218+
" <td>0.818182</td>\n",
219219
" <td>1.0</td>\n",
220220
" </tr>\n",
221221
" <tr>\n",
222222
" <th>3</th>\n",
223223
" <td>4</td>\n",
224-
" <td>104</td>\n",
225-
" <td>0.056986</td>\n",
226-
" <td>0.095890</td>\n",
227-
" <td>0.594286</td>\n",
224+
" <td>101</td>\n",
225+
" <td>0.055342</td>\n",
226+
" <td>0.103562</td>\n",
227+
" <td>0.534392</td>\n",
228228
" <td>2.0</td>\n",
229229
" </tr>\n",
230230
" <tr>\n",
231231
" <th>4</th>\n",
232232
" <td>5</td>\n",
233-
" <td>162</td>\n",
234-
" <td>0.088767</td>\n",
235-
" <td>0.184658</td>\n",
236-
" <td>0.480712</td>\n",
233+
" <td>185</td>\n",
234+
" <td>0.101370</td>\n",
235+
" <td>0.204932</td>\n",
236+
" <td>0.494652</td>\n",
237237
" <td>2.0</td>\n",
238238
" </tr>\n",
239239
" </tbody>\n",
@@ -243,10 +243,10 @@
243243
"text/plain": [
244244
" beds freq pct c_pct prob_delay 1_in_n_delay\n",
245245
"0 1 2 0.001096 0.001096 1.000000 1.0\n",
246-
"1 2 12 0.006575 0.007671 0.857143 1.0\n",
247-
"2 3 57 0.031233 0.038904 0.802817 1.0\n",
248-
"3 4 104 0.056986 0.095890 0.594286 2.0\n",
249-
"4 5 162 0.088767 0.184658 0.480712 2.0"
246+
"1 2 14 0.007671 0.008767 0.875000 1.0\n",
247+
"2 3 72 0.039452 0.048219 0.818182 1.0\n",
248+
"3 4 101 0.055342 0.103562 0.534392 2.0\n",
249+
"4 5 185 0.101370 0.204932 0.494652 2.0"
250250
]
251251
},
252252
"metadata": {},
@@ -284,47 +284,47 @@
284284
" <tbody>\n",
285285
" <tr>\n",
286286
" <th>0</th>\n",
287-
" <td>2</td>\n",
288287
" <td>1</td>\n",
289-
" <td>0.000548</td>\n",
290-
" <td>0.000548</td>\n",
288+
" <td>7</td>\n",
289+
" <td>0.003836</td>\n",
290+
" <td>0.003836</td>\n",
291291
" <td>1.000000</td>\n",
292292
" <td>1.0</td>\n",
293293
" </tr>\n",
294294
" <tr>\n",
295295
" <th>1</th>\n",
296-
" <td>3</td>\n",
297-
" <td>8</td>\n",
298-
" <td>0.004384</td>\n",
299-
" <td>0.004932</td>\n",
300-
" <td>0.888889</td>\n",
301-
" <td>1.0</td>\n",
296+
" <td>2</td>\n",
297+
" <td>5</td>\n",
298+
" <td>0.002740</td>\n",
299+
" <td>0.006575</td>\n",
300+
" <td>0.416667</td>\n",
301+
" <td>2.0</td>\n",
302302
" </tr>\n",
303303
" <tr>\n",
304304
" <th>2</th>\n",
305-
" <td>4</td>\n",
306-
" <td>35</td>\n",
307-
" <td>0.019178</td>\n",
308-
" <td>0.024110</td>\n",
309-
" <td>0.795455</td>\n",
305+
" <td>3</td>\n",
306+
" <td>26</td>\n",
307+
" <td>0.014247</td>\n",
308+
" <td>0.020822</td>\n",
309+
" <td>0.684211</td>\n",
310310
" <td>1.0</td>\n",
311311
" </tr>\n",
312312
" <tr>\n",
313313
" <th>3</th>\n",
314-
" <td>5</td>\n",
315-
" <td>47</td>\n",
316-
" <td>0.025753</td>\n",
317-
" <td>0.049863</td>\n",
318-
" <td>0.516484</td>\n",
314+
" <td>4</td>\n",
315+
" <td>64</td>\n",
316+
" <td>0.035068</td>\n",
317+
" <td>0.055890</td>\n",
318+
" <td>0.627451</td>\n",
319319
" <td>2.0</td>\n",
320320
" </tr>\n",
321321
" <tr>\n",
322322
" <th>4</th>\n",
323-
" <td>6</td>\n",
324-
" <td>129</td>\n",
325-
" <td>0.070685</td>\n",
326-
" <td>0.120548</td>\n",
327-
" <td>0.586364</td>\n",
323+
" <td>5</td>\n",
324+
" <td>113</td>\n",
325+
" <td>0.061918</td>\n",
326+
" <td>0.117808</td>\n",
327+
" <td>0.525581</td>\n",
328328
" <td>2.0</td>\n",
329329
" </tr>\n",
330330
" </tbody>\n",
@@ -333,11 +333,11 @@
333333
],
334334
"text/plain": [
335335
" beds freq pct c_pct prob_delay 1_in_n_delay\n",
336-
"0 2 1 0.000548 0.000548 1.000000 1.0\n",
337-
"1 3 8 0.004384 0.004932 0.888889 1.0\n",
338-
"2 4 35 0.019178 0.024110 0.795455 1.0\n",
339-
"3 5 47 0.025753 0.049863 0.516484 2.0\n",
340-
"4 6 129 0.070685 0.120548 0.586364 2.0"
336+
"0 1 7 0.003836 0.003836 1.000000 1.0\n",
337+
"1 2 5 0.002740 0.006575 0.416667 2.0\n",
338+
"2 3 26 0.014247 0.020822 0.684211 1.0\n",
339+
"3 4 64 0.035068 0.055890 0.627451 2.0\n",
340+
"4 5 113 0.061918 0.117808 0.525581 2.0"
341341
]
342342
},
343343
"metadata": {},

0 commit comments

Comments
 (0)