folivo/PINA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sorted variables

Browse Source
This commit is contained in:
Dario Coscia
2024-11-07 15:28:21 +01:00
committed by Nicola Demo
parent 59c9a173b4
commit 23bc40924f
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pina/geometry/cartesian.py
View File

@@ -232,16 +232,18 @@ class CartesianDomain(Location):
return result
if variables == "all":
variables = self.variables
elif isinstance(variables, (list, tuple)):
variables = sorted(variables)
if self.fixed_ and (not self.range_):
return _single_points_sample(n, variables)
if variables == "all":
variables = list(self.range_.keys()) + list(self.fixed_.keys())
if mode in ["grid", "chebyshev"]:
return _1d_sampler(n, mode, variables)
return _1d_sampler(n, mode, variables).extract(variables)
elif mode in ["random", "lh", "latin"]:
return _Nd_sampler(n, mode, variables)
return _Nd_sampler(n, mode, variables).extract(variables)
else:
raise ValueError(f"mode={mode} is not valid.")