simoptlib 1.2.1__tar.gz → 1.2.2__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.
- {simoptlib-1.2.1 → simoptlib-1.2.2}/PKG-INFO +3 -1
- {simoptlib-1.2.1 → simoptlib-1.2.2}/pyproject.toml +7 -1
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/input_models.py +3 -3
- simoptlib-1.2.2/simopt/models/_ext.py +56 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/models/amusementpark.py +6 -1
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/models/chessmm.py +2 -2
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/models/cntnv.py +2 -2
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/models/dualsourcing.py +2 -2
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/models/dynamnews.py +2 -2
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/models/facilitysizing.py +2 -2
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/models/hotel.py +1 -1
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/models/ironore.py +2 -2
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/models/network.py +2 -2
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/models/rmitd.py +1 -1
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/models/tableallocation.py +7 -4
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simoptlib.egg-info/PKG-INFO +3 -1
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simoptlib.egg-info/SOURCES.txt +1 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simoptlib.egg-info/requires.txt +3 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/LICENSE +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/README.md +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/setup.cfg +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/GUI.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/__init__.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/__main__.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/base.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/bootstrap.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/curve.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/curve_utils.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/data_farming/data_farming_core.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/data_farming/nolhs.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/data_farming/nolhs_design_table.npz +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/data_farming_base.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/directory.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/experiment/__init__.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/experiment/multiple.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/experiment/post_normalize.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/experiment/single.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/experiment_base.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/experimental.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/feasibility.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/gui/data_farming_window.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/gui/df_object.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/gui/main_menu.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/gui/new_experiment_window.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/gui/plot_window.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/gui/toplevel_custom.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/model.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/models/__init__.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/models/contam.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/models/example.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/models/fixedsan.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/models/mm1queue.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/models/paramesti.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/models/san.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/models/sscont.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/plot_type.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/plots/__init__.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/plots/area_scatterplot.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/plots/feasibility_progress.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/plots/progress_curve.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/plots/solvability_cdf.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/plots/solvability_profile.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/plots/terminal_feasibility.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/plots/terminal_progress.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/plots/terminal_scatterplot.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/plots/utils.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/problem.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/problem_types.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/solver.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/solvers/__init__.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/solvers/adam.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/solvers/aloe.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/solvers/astrodf.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/solvers/fcsa.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/solvers/neldmd.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/solvers/randomsearch.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/solvers/spsa.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/solvers/strong.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/solvers/utils.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/utils.py +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simopt/utils.pyi +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simoptlib.egg-info/dependency_links.txt +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/simoptlib.egg-info/top_level.txt +0 -0
- {simoptlib-1.2.1 → simoptlib-1.2.2}/test/test_experiments.py +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: simoptlib
|
|
3
|
-
Version: 1.2.
|
|
3
|
+
Version: 1.2.2
|
|
4
4
|
Summary: A testbed for simulation-optimization experiments.
|
|
5
5
|
Author-email: David Eckman <eckman@tamu.edu>, Shane Henderson <sgh9@cornell.edu>, Sara Shashaani <sshasha2@ncsu.edu>, William Grochocinski <williamgrochocinski@gmail.com>
|
|
6
6
|
License: MIT License
|
|
@@ -56,6 +56,8 @@ Requires-Dist: sphinx-autoapi>=3.6.1; extra == "docs"
|
|
|
56
56
|
Requires-Dist: sphinx-rtd-theme>=3.0.2; extra == "docs"
|
|
57
57
|
Provides-Extra: notebooks
|
|
58
58
|
Requires-Dist: ipykernel>=7.1.0; extra == "notebooks"
|
|
59
|
+
Provides-Extra: ext
|
|
60
|
+
Requires-Dist: simopt-extensions; extra == "ext"
|
|
59
61
|
Dynamic: license-file
|
|
60
62
|
|
|
61
63
|

|
|
@@ -11,9 +11,12 @@ exclude = ["build*"]
|
|
|
11
11
|
[tool.setuptools.package-data]
|
|
12
12
|
"simopt.data_farming" = ["*.npz"]
|
|
13
13
|
|
|
14
|
+
[tool.uv.sources]
|
|
15
|
+
simopt-extensions = { git = "https://github.com/cenwangumass/simopt-extensions", rev = "2bcf002" }
|
|
16
|
+
|
|
14
17
|
[project]
|
|
15
18
|
name = "simoptlib"
|
|
16
|
-
version = "1.2.
|
|
19
|
+
version = "1.2.2"
|
|
17
20
|
authors = [
|
|
18
21
|
{ name = "David Eckman", email = "eckman@tamu.edu" },
|
|
19
22
|
{ name = "Shane Henderson", email = "sgh9@cornell.edu" },
|
|
@@ -53,6 +56,9 @@ dev = [
|
|
|
53
56
|
]
|
|
54
57
|
docs = ["sphinx>=8.2.3", "sphinx-autoapi>=3.6.1", "sphinx-rtd-theme>=3.0.2"]
|
|
55
58
|
notebooks = ["ipykernel>=7.1.0"]
|
|
59
|
+
ext = [
|
|
60
|
+
"simopt-extensions",
|
|
61
|
+
]
|
|
56
62
|
|
|
57
63
|
[project.urls]
|
|
58
64
|
"Homepage" = "https://github.com/simopt-admin/simopt"
|
|
@@ -3,9 +3,9 @@
|
|
|
3
3
|
import bisect
|
|
4
4
|
import itertools
|
|
5
5
|
import math
|
|
6
|
-
import random
|
|
7
6
|
from abc import abstractmethod
|
|
8
7
|
from collections.abc import Sequence
|
|
8
|
+
from random import Random
|
|
9
9
|
from typing import ParamSpec, Protocol, TypeVar
|
|
10
10
|
|
|
11
11
|
P = ParamSpec("P")
|
|
@@ -15,9 +15,9 @@ R = TypeVar("R", covariant=True)
|
|
|
15
15
|
class InputModel(Protocol[P, R]):
|
|
16
16
|
"""Abstract base for input models used by simulations."""
|
|
17
17
|
|
|
18
|
-
rng:
|
|
18
|
+
rng: Random | None = None
|
|
19
19
|
|
|
20
|
-
def set_rng(self, rng:
|
|
20
|
+
def set_rng(self, rng: Random) -> None:
|
|
21
21
|
"""Attach a Python RNG to the input model.
|
|
22
22
|
|
|
23
23
|
Args:
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
import importlib
|
|
2
|
+
import os
|
|
3
|
+
from collections.abc import Callable
|
|
4
|
+
from types import ModuleType
|
|
5
|
+
|
|
6
|
+
from simopt.model import Model
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
def find_model_patches(module: ModuleType) -> list[Callable]:
|
|
10
|
+
patches: list[Callable] = []
|
|
11
|
+
for attr in dir(module):
|
|
12
|
+
if not attr.startswith("patch_model"):
|
|
13
|
+
continue
|
|
14
|
+
candidate = getattr(module, attr)
|
|
15
|
+
if callable(candidate):
|
|
16
|
+
patches.append(candidate)
|
|
17
|
+
return patches
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
def patch(model_class: type[Model], patch_function: Callable) -> None:
|
|
21
|
+
# Ask the extension what class to patch and with what method
|
|
22
|
+
class_name, method = patch_function()
|
|
23
|
+
# Patch the method into the model_class if it matches
|
|
24
|
+
full_name = model_class.__module__ + "." + model_class.__qualname__
|
|
25
|
+
if full_name == class_name:
|
|
26
|
+
model_class.replicate = method
|
|
27
|
+
|
|
28
|
+
|
|
29
|
+
def load_module(module_name: str, model_class: type[Model]) -> None:
|
|
30
|
+
# Import the specified library
|
|
31
|
+
try:
|
|
32
|
+
module = importlib.import_module(module_name)
|
|
33
|
+
except ImportError as e:
|
|
34
|
+
raise ImportError(f"SimOpt failed to load extension '{module_name}'") from e
|
|
35
|
+
|
|
36
|
+
# Find all patch_model* functions in the library
|
|
37
|
+
patches = find_model_patches(module)
|
|
38
|
+
if not patches:
|
|
39
|
+
raise ImportError(f"'{module_name}' does not have any 'patch_model*' functions")
|
|
40
|
+
|
|
41
|
+
# Apply each patch to the model_class
|
|
42
|
+
for p in patches:
|
|
43
|
+
patch(model_class, p)
|
|
44
|
+
|
|
45
|
+
|
|
46
|
+
def patch_model(model_class: type[Model]) -> None:
|
|
47
|
+
env_var = os.environ.get("SIMOPT_EXT")
|
|
48
|
+
if not env_var:
|
|
49
|
+
return
|
|
50
|
+
|
|
51
|
+
# Assume that the user has specified a comma-separated list of libraries to import.
|
|
52
|
+
# For example, SIMOPT_EXT="simopt_extension_a,simopt_extension_b"
|
|
53
|
+
for part in env_var.split(","):
|
|
54
|
+
module_name = part.strip()
|
|
55
|
+
if module_name:
|
|
56
|
+
load_module(module_name, model_class)
|
|
@@ -17,6 +17,7 @@ from simopt.base import (
|
|
|
17
17
|
VariableType,
|
|
18
18
|
)
|
|
19
19
|
from simopt.input_models import Exp, Gamma, WeightedChoice
|
|
20
|
+
from simopt.models._ext import patch_model
|
|
20
21
|
|
|
21
22
|
INF = float("inf")
|
|
22
23
|
|
|
@@ -478,9 +479,10 @@ class AmusementPark(Model):
|
|
|
478
479
|
cumulative_util = [cumulative_util[i] / time_open for i in attraction_range]
|
|
479
480
|
|
|
480
481
|
# Calculate responses from simulation data.
|
|
482
|
+
percent_departed = total_departed / total_visitors if total_visitors else 0
|
|
481
483
|
responses = {
|
|
482
484
|
"total_departed": total_departed,
|
|
483
|
-
"percent_departed":
|
|
485
|
+
"percent_departed": percent_departed,
|
|
484
486
|
"average_number_in_system": time_average / time_open,
|
|
485
487
|
"attraction_utilization_percentages": cumulative_util,
|
|
486
488
|
}
|
|
@@ -543,3 +545,6 @@ class AmusementParkMinDepart(Problem):
|
|
|
543
545
|
n_elements=num_elements, summation=summation, with_zero=False
|
|
544
546
|
)
|
|
545
547
|
return tuple(vector)
|
|
548
|
+
|
|
549
|
+
|
|
550
|
+
patch_model(AmusementPark)
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
from __future__ import annotations
|
|
4
4
|
|
|
5
|
-
import
|
|
5
|
+
from random import Random
|
|
6
6
|
from typing import Annotated, ClassVar, Final
|
|
7
7
|
|
|
8
8
|
import numpy as np
|
|
@@ -111,7 +111,7 @@ class ChessAvgDifferenceConfig(BaseModel):
|
|
|
111
111
|
class EloInputModel(InputModel):
|
|
112
112
|
"""Input model for player Elo ratings."""
|
|
113
113
|
|
|
114
|
-
rng:
|
|
114
|
+
rng: Random | None = None
|
|
115
115
|
|
|
116
116
|
def random(
|
|
117
117
|
self, mean: float, std: float, min_rating: float, max_rating: float
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
from __future__ import annotations
|
|
4
4
|
|
|
5
|
-
import
|
|
5
|
+
from random import Random
|
|
6
6
|
from typing import Annotated, ClassVar, Self
|
|
7
7
|
|
|
8
8
|
import numpy as np
|
|
@@ -128,7 +128,7 @@ class CntNVMaxProfitConfig(BaseModel):
|
|
|
128
128
|
class DemandInputModel(InputModel):
|
|
129
129
|
"""Input model for Burr Type XII demand."""
|
|
130
130
|
|
|
131
|
-
rng:
|
|
131
|
+
rng: Random | None = None
|
|
132
132
|
|
|
133
133
|
def random(self, burr_c: float, burr_k: float) -> float: # noqa: D102
|
|
134
134
|
# Generate random demand according to Burr Type XII distribution.
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
from __future__ import annotations
|
|
4
4
|
|
|
5
|
-
import
|
|
5
|
+
from random import Random
|
|
6
6
|
from typing import Annotated, ClassVar, Self
|
|
7
7
|
|
|
8
8
|
import numpy as np
|
|
@@ -166,7 +166,7 @@ class DualSourcingMinCostConfig(BaseModel):
|
|
|
166
166
|
class DemandInputModel(InputModel):
|
|
167
167
|
"""Input model for daily demand."""
|
|
168
168
|
|
|
169
|
-
rng:
|
|
169
|
+
rng: Random | None = None
|
|
170
170
|
|
|
171
171
|
def random(self, mu: float, sigma: float) -> int: # noqa: D102
|
|
172
172
|
def round_and_clamp_non_neg(x: float | int) -> int:
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
from __future__ import annotations
|
|
4
4
|
|
|
5
5
|
import math
|
|
6
|
-
import
|
|
6
|
+
from random import Random
|
|
7
7
|
from typing import Annotated, ClassVar, Final, Self
|
|
8
8
|
|
|
9
9
|
import numpy as np
|
|
@@ -155,7 +155,7 @@ class DynamNewsMaxProfitConfig(BaseModel):
|
|
|
155
155
|
class Utility(InputModel):
|
|
156
156
|
"""Input model for customer utility sampling."""
|
|
157
157
|
|
|
158
|
-
rng:
|
|
158
|
+
rng: Random | None = None
|
|
159
159
|
|
|
160
160
|
def _gumbelvariate(self, mu: float, beta: float) -> float:
|
|
161
161
|
assert self.rng is not None
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
from __future__ import annotations
|
|
4
4
|
|
|
5
|
-
import
|
|
5
|
+
from random import Random
|
|
6
6
|
from typing import Annotated, ClassVar, Final, Self
|
|
7
7
|
|
|
8
8
|
import numpy as np
|
|
@@ -204,7 +204,7 @@ class FacilitySizingTotalCostConfig(BaseModel):
|
|
|
204
204
|
class DemandInputModel(InputModel):
|
|
205
205
|
"""Input model for multivariate normal demand at facilities."""
|
|
206
206
|
|
|
207
|
-
rng:
|
|
207
|
+
rng: Random | None = None
|
|
208
208
|
|
|
209
209
|
def _mvnormalvariate(
|
|
210
210
|
self,
|
|
@@ -307,7 +307,7 @@ class Hotel(Model):
|
|
|
307
307
|
total_revenue = 0
|
|
308
308
|
|
|
309
309
|
# Generate interarrival times
|
|
310
|
-
arr_bound = 10 * round(168 *
|
|
310
|
+
arr_bound = 10 * round(168 * sum(f_lambda))
|
|
311
311
|
arr_time = np.array(
|
|
312
312
|
[
|
|
313
313
|
[self.arrival_model.random(f_lambda[i]) for _ in range(arr_bound)]
|
|
@@ -6,8 +6,8 @@
|
|
|
6
6
|
|
|
7
7
|
from __future__ import annotations
|
|
8
8
|
|
|
9
|
-
import random
|
|
10
9
|
from math import copysign, sqrt
|
|
10
|
+
from random import Random
|
|
11
11
|
from typing import Annotated, ClassVar, Self
|
|
12
12
|
|
|
13
13
|
import numpy as np
|
|
@@ -202,7 +202,7 @@ class IronOreMaxRevConfig(BaseModel):
|
|
|
202
202
|
class MovementInputModel(InputModel):
|
|
203
203
|
"""Input model for mining movement and price shocks."""
|
|
204
204
|
|
|
205
|
-
rng:
|
|
205
|
+
rng: Random | None = None
|
|
206
206
|
|
|
207
207
|
def random(self, mean: float, std: float) -> float: # noqa: D102
|
|
208
208
|
assert self.rng is not None
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
|
|
3
3
|
from __future__ import annotations
|
|
4
4
|
|
|
5
|
-
import random
|
|
6
5
|
from enum import IntEnum
|
|
6
|
+
from random import Random
|
|
7
7
|
from typing import Annotated, ClassVar, Final, Self
|
|
8
8
|
|
|
9
9
|
import numpy as np
|
|
@@ -215,7 +215,7 @@ class NetworkMinTotalCostConfig(BaseModel):
|
|
|
215
215
|
class RouteInputModel(InputModel):
|
|
216
216
|
"""Input model for routing choices in the network."""
|
|
217
217
|
|
|
218
|
-
rng:
|
|
218
|
+
rng: Random | None = None
|
|
219
219
|
|
|
220
220
|
def random(self, choices: list[int], weights: list[float], k: int) -> list[int]: # noqa: D102
|
|
221
221
|
assert self.rng is not None
|
|
@@ -165,7 +165,7 @@ class DemandInputModel(InputModel):
|
|
|
165
165
|
x_rng: MRG32k3a | None = None
|
|
166
166
|
y_rng: MRG32k3a | None = None
|
|
167
167
|
|
|
168
|
-
def set_rng(self, rng: list[MRG32k3a] | tuple[MRG32k3a, MRG32k3a]) -> None: # noqa: D102 #
|
|
168
|
+
def set_rng(self, rng: list[MRG32k3a] | tuple[MRG32k3a, MRG32k3a]) -> None: # noqa: D102 # type: ignore
|
|
169
169
|
self.x_rng = rng[0]
|
|
170
170
|
self.y_rng = rng[1]
|
|
171
171
|
|
|
@@ -5,7 +5,7 @@ from __future__ import annotations
|
|
|
5
5
|
import bisect
|
|
6
6
|
import itertools
|
|
7
7
|
from collections.abc import Sequence
|
|
8
|
-
from typing import Annotated, ClassVar, Self
|
|
8
|
+
from typing import Annotated, ClassVar, Self, cast
|
|
9
9
|
|
|
10
10
|
import numpy as np
|
|
11
11
|
from pydantic import BaseModel, Field, model_validator
|
|
@@ -256,9 +256,12 @@ class TableAllocation(Model):
|
|
|
256
256
|
# Pass through all arrivals of groups to the restaurants.
|
|
257
257
|
for n in range(n_arrivals):
|
|
258
258
|
# Determine group size.
|
|
259
|
-
group_size =
|
|
260
|
-
|
|
261
|
-
|
|
259
|
+
group_size = cast(
|
|
260
|
+
int,
|
|
261
|
+
self.group_size_model.random(
|
|
262
|
+
population=group_size_options,
|
|
263
|
+
weights=f_lambda,
|
|
264
|
+
),
|
|
262
265
|
)
|
|
263
266
|
|
|
264
267
|
# Find smallest table size to start search.
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: simoptlib
|
|
3
|
-
Version: 1.2.
|
|
3
|
+
Version: 1.2.2
|
|
4
4
|
Summary: A testbed for simulation-optimization experiments.
|
|
5
5
|
Author-email: David Eckman <eckman@tamu.edu>, Shane Henderson <sgh9@cornell.edu>, Sara Shashaani <sshasha2@ncsu.edu>, William Grochocinski <williamgrochocinski@gmail.com>
|
|
6
6
|
License: MIT License
|
|
@@ -56,6 +56,8 @@ Requires-Dist: sphinx-autoapi>=3.6.1; extra == "docs"
|
|
|
56
56
|
Requires-Dist: sphinx-rtd-theme>=3.0.2; extra == "docs"
|
|
57
57
|
Provides-Extra: notebooks
|
|
58
58
|
Requires-Dist: ipykernel>=7.1.0; extra == "notebooks"
|
|
59
|
+
Provides-Extra: ext
|
|
60
|
+
Requires-Dist: simopt-extensions; extra == "ext"
|
|
59
61
|
Dynamic: license-file
|
|
60
62
|
|
|
61
63
|

|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|