Skip to content

Commit 11b625f

Browse files
add quasi-random sampling method: Halton (#828)
1 parent 2f7e488 commit 11b625f

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
lines changed

ppsci/constraint/boundary_constraint.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class BoundaryConstraint(base.Constraint):
4545
geom (geometry.Geometry): Geometry where data sampled from.
4646
dataloader_cfg (Dict[str, Any]): Dataloader config.
4747
loss (loss.Loss): Loss functor.
48-
random (Literal["pseudo", "LHS"], optional): Random method for sampling data in
48+
random (Literal["pseudo", "Halton", "LHS"], optional): Random method for sampling data in
4949
geometry. Defaults to "pseudo".
5050
criteria (Optional[Callable]): Criteria for refining specified boundaries.
5151
Defaults to None.
@@ -79,7 +79,7 @@ def __init__(
7979
geom: geometry.Geometry,
8080
dataloader_cfg: Dict[str, Any],
8181
loss: "loss.Loss",
82-
random: Literal["pseudo", "LHS"] = "pseudo",
82+
random: Literal["pseudo", "Halton", "LHS"] = "pseudo",
8383
criteria: Optional[Callable] = None,
8484
evenly: bool = False,
8585
weight_dict: Optional[Dict[str, Union[float, Callable]]] = None,

ppsci/constraint/initial_constraint.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class InitialConstraint(base.Constraint):
4545
geom (geometry.TimeXGeometry): Geometry where data sampled from.
4646
dataloader_cfg (Dict[str, Any]): Dataloader config.
4747
loss (loss.Loss): Loss functor.
48-
random (Literal["pseudo", "LHS"], optional): Random method for sampling data in
48+
random (Literal["pseudo", "Halton", "LHS"], optional): Random method for sampling data in
4949
geometry. Defaults to "pseudo".
5050
criteria (Optional[Callable]): Criteria for refining specified boundaries.
5151
Defaults to None.
@@ -84,7 +84,7 @@ def __init__(
8484
geom: geometry.TimeXGeometry,
8585
dataloader_cfg: Dict[str, Any],
8686
loss: "loss.Loss",
87-
random: Literal["pseudo", "LHS"] = "pseudo",
87+
random: Literal["pseudo", "Halton", "LHS"] = "pseudo",
8888
criteria: Optional[Callable] = None,
8989
evenly: bool = False,
9090
weight_dict: Optional[Dict[str, Callable]] = None,

ppsci/constraint/integral_constraint.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class IntegralConstraint(base.Constraint):
4848
geom (geometry.Geometry): Geometry where data sampled from.
4949
dataloader_cfg (Dict[str, Any]): Dataloader config.
5050
loss (loss.Loss): Loss functor.
51-
random (Literal["pseudo", "LHS"], optional): Random method for sampling data in
51+
random (Literal["pseudo", "Halton", "LHS"], optional): Random method for sampling data in
5252
geometry. Defaults to "pseudo".
5353
criteria (Optional[Callable]): Criteria for refining specified boundaries.
5454
Defaults to None.
@@ -81,7 +81,7 @@ def __init__(
8181
geom: geometry.Geometry,
8282
dataloader_cfg: Dict[str, Any],
8383
loss: "loss.Loss",
84-
random: Literal["pseudo", "LHS"] = "pseudo",
84+
random: Literal["pseudo", "Halton", "LHS"] = "pseudo",
8585
criteria: Optional[Callable] = None,
8686
weight_dict: Optional[Dict[str, Callable]] = None,
8787
name: str = "IgC",

ppsci/constraint/interior_constraint.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class InteriorConstraint(base.Constraint):
4545
geom (geometry.Geometry): Geometry where data sampled from.
4646
dataloader_cfg (Dict[str, Any]): Dataloader config.
4747
loss (loss.Loss): Loss functor.
48-
random (Literal["pseudo", "LHS"], optional): Random method for sampling data in
48+
random (Literal["pseudo", "Halton", "LHS"], optional): Random method for sampling data in
4949
geometry. Defaults to "pseudo".
5050
criteria (Optional[Callable]): Criteria for refining specified boundaries.
5151
Defaults to None.
@@ -81,7 +81,7 @@ def __init__(
8181
geom: geometry.Geometry,
8282
dataloader_cfg: Dict[str, Any],
8383
loss: "loss.Loss",
84-
random: Literal["pseudo", "LHS"] = "pseudo",
84+
random: Literal["pseudo", "Halton", "LHS"] = "pseudo",
8585
criteria: Optional[Callable] = None,
8686
evenly: bool = False,
8787
weight_dict: Optional[Dict[str, Union[Callable, float]]] = None,

ppsci/constraint/periodic_constraint.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class PeriodicConstraint(base.Constraint):
4747
dataloader_cfg (Dict[str, Any]): Dataloader config.
4848
periodic_key (str): name of dimension which periodic constraint applied to.
4949
loss (loss.Loss): Loss functor.
50-
random (Literal["pseudo", "LHS"], optional): Random method for sampling data in
50+
random (Literal["pseudo", "Halton", "LHS"], optional): Random method for sampling data in
5151
geometry. Defaults to "pseudo".
5252
criteria (Optional[Callable]): Criteria for refining specified boundaries.
5353
Defaults to None.
@@ -66,7 +66,7 @@ def __init__(
6666
periodic_key: str,
6767
dataloader_cfg: Dict[str, Any],
6868
loss: "loss.Loss",
69-
random: Literal["pseudo", "LHS"] = "pseudo",
69+
random: Literal["pseudo", "Halton", "LHS"] = "pseudo",
7070
criteria: Optional[Callable] = None,
7171
evenly: bool = False,
7272
weight_dict: Optional[Dict[str, Callable]] = None,

ppsci/geometry/sampler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626

2727
def sample(
28-
n_samples: int, ndim: int, method: Literal["pseudo", "LHS"] = "pseudo"
28+
n_samples: int, ndim: int, method: Literal["pseudo", "Halton", "LHS"] = "pseudo"
2929
) -> np.ndarray:
3030
"""Generate pseudorandom or quasi-random samples in [0, 1]^ndim.
3131

ppsci/validate/geo_validator.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class GeometryValidator(base.Validator):
4444
geom (geometry.Geometry): Geometry where data sampled from.
4545
dataloader_cfg (Dict[str, Any]): Dataloader config.
4646
loss (loss.Loss): Loss functor.
47-
random (Literal["pseudo", "LHS"], optional): Random method for sampling data in
47+
random (Literal["pseudo", "Halton", "LHS"], optional): Random method for sampling data in
4848
geometry. Defaults to "pseudo".
4949
criteria (Optional[Callable]): Criteria for refining specified domain. Defaults to None.
5050
evenly (bool, optional): Whether to use evenly distribution sampling. Defaults to False.
@@ -76,7 +76,7 @@ def __init__(
7676
geom: geometry.Geometry,
7777
dataloader_cfg: Dict[str, Any],
7878
loss: loss.Loss,
79-
random: Literal["pseudo", "LHS"] = "pseudo",
79+
random: Literal["pseudo", "Halton", "LHS"] = "pseudo",
8080
criteria: Optional[Callable] = None,
8181
evenly: bool = False,
8282
metric: Optional[Dict[str, metric.Metric]] = None,

0 commit comments

Comments
 (0)