Skip to content

Commit

Permalink
Minor edit to pass lint and formatter
Browse files Browse the repository at this point in the history
  • Loading branch information
damar-wicaksono committed Nov 4, 2024
1 parent 1f9fd43 commit 836c598
Show file tree
Hide file tree
Showing 22 changed files with 36 additions and 45 deletions.
8 changes: 2 additions & 6 deletions src/uqtestfuns/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,7 @@ def list_functions(
if not available_class.default_input_dimension:
default_input_dimension = "M"
else:
default_input_dimension = (
available_class.default_input_dimension
)
default_input_dimension = available_class.default_input_dimension

description = available_class.description
is_parameterized = (
Expand Down Expand Up @@ -267,9 +265,7 @@ def _get_functions_from_dimension(
available_class_name,
available_class_path,
) in available_classes.items():
default_input_dimension = (
available_class_path.default_input_dimension
)
default_input_dimension = available_class_path.default_input_dimension
if not default_input_dimension:
default_input_dimension = "m"

Expand Down
7 changes: 2 additions & 5 deletions src/uqtestfuns/meta/metaspec.py
Original file line number Diff line number Diff line change
Expand Up @@ -303,14 +303,11 @@ class UQMetaFunSpec:
def __post_init__(self, effects_dict):
if self.input_dimension < 1:
raise ValueError(
f"input dimension must be > 0! "
f"Got {self.input_dimension}"
f"input dimension must be > 0! Got {self.input_dimension}"
)
self._effects_tuples = None
# Clean up the effects dictionary
self.effects = _preprocess_effects(
effects_dict, self.input_dimension
)
self.effects = _preprocess_effects(effects_dict, self.input_dimension)

def get_sample(
self, sample_size: int = 1
Expand Down
4 changes: 2 additions & 2 deletions src/uqtestfuns/test_functions/alemazkoor.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@
name="X1",
distribution="uniform",
parameters=[-1, 1],
description="None",
description=None,
),
UnivDistSpec(
name="X2",
distribution="uniform",
parameters=[-1, 1],
description="None",
description=None,
),
],
copulas=None,
Expand Down
2 changes: 1 addition & 1 deletion src/uqtestfuns/test_functions/bratley1992.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def _bratley_input(input_dimension: int) -> List[UnivDistSpec]:
name=f"X{i + 1}",
distribution="uniform",
parameters=[0.0, 1.0],
description="None",
description=None,
)
)

Expand Down
4 changes: 2 additions & 2 deletions src/uqtestfuns/test_functions/convex_fail_domain.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@
name="X1",
distribution="normal",
parameters=[0, 1],
description="None",
description=None,
),
UnivDistSpec(
name="X2",
distribution="normal",
parameters=[0, 1],
description="None",
description=None,
),
],
copulas=None,
Expand Down
2 changes: 1 addition & 1 deletion src/uqtestfuns/test_functions/damped_cosine.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
name="x",
distribution="uniform",
parameters=[0.0, 1.0],
description="None",
description=None,
)
],
copulas=None,
Expand Down
2 changes: 1 addition & 1 deletion src/uqtestfuns/test_functions/forrester.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
name="x",
distribution="uniform",
parameters=[0, 1],
description="None",
description=None,
)
],
copulas=None,
Expand Down
4 changes: 2 additions & 2 deletions src/uqtestfuns/test_functions/four_branch.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@
name="X1",
distribution="normal",
parameters=[0, 1],
description="None",
description=None,
),
UnivDistSpec(
name="X2",
distribution="normal",
parameters=[0, 1],
description="None",
description=None,
),
],
copulas=None,
Expand Down
4 changes: 2 additions & 2 deletions src/uqtestfuns/test_functions/franke.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@
name="X1",
distribution="uniform",
parameters=[0.0, 1.0],
description="None",
description=None,
),
UnivDistSpec(
name="X2",
distribution="uniform",
parameters=[0.0, 1.0],
description="None",
description=None,
),
]

Expand Down
4 changes: 2 additions & 2 deletions src/uqtestfuns/test_functions/friedman.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
name=f"x_{i + 1}",
distribution="uniform",
parameters=[0, 1],
description="None",
description=None,
)
for i in range(6)
],
Expand All @@ -65,7 +65,7 @@
name=f"x_{i + 1}",
distribution="uniform",
parameters=[0, 1],
description="None",
description=None,
)
for i in range(10)
],
Expand Down
4 changes: 2 additions & 2 deletions src/uqtestfuns/test_functions/gayton_hat.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@
name="U1",
distribution="normal",
parameters=[0, 1],
description="None",
description=None,
),
UnivDistSpec(
name="U2",
distribution="normal",
parameters=[0, 1],
description="None",
description=None,
),
],
copulas=None,
Expand Down
2 changes: 1 addition & 1 deletion src/uqtestfuns/test_functions/gramacy2007.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
name="x",
distribution="uniform",
parameters=[0.0, 20.0],
description="None",
description=None,
)
],
copulas=None,
Expand Down
4 changes: 2 additions & 2 deletions src/uqtestfuns/test_functions/hyper_sphere.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@
name="X1",
distribution="normal",
parameters=[0.5, 0.2],
description="None",
description=None,
),
UnivDistSpec(
name="X2",
distribution="normal",
parameters=[0.5, 0.2],
description="None",
description=None,
),
],
copulas=None,
Expand Down
6 changes: 3 additions & 3 deletions src/uqtestfuns/test_functions/ishigami.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,19 @@
name="X1",
distribution="uniform",
parameters=[-np.pi, np.pi],
description="None",
description=None,
),
UnivDistSpec(
name="X2",
distribution="uniform",
parameters=[-np.pi, np.pi],
description="None",
description=None,
),
UnivDistSpec(
name="X3",
distribution="uniform",
parameters=[-np.pi, np.pi],
description="None",
description=None,
),
]

Expand Down
4 changes: 2 additions & 2 deletions src/uqtestfuns/test_functions/mclain.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@
name="X1",
distribution="uniform",
parameters=[1.0, 10.0],
description="None",
description=None,
),
UnivDistSpec(
name="X2",
distribution="uniform",
parameters=[1.0, 10.0],
description="None",
description=None,
),
]

Expand Down
2 changes: 1 addition & 1 deletion src/uqtestfuns/test_functions/oakley2002.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
name="x",
distribution="normal",
parameters=[0.0, 4.0],
description="None",
description=None,
)
],
copulas=None,
Expand Down
4 changes: 2 additions & 2 deletions src/uqtestfuns/test_functions/rs_quadratic.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@
name="X1",
distribution="normal",
parameters=[11.0, 1.0],
description="None",
description=None,
),
UnivDistSpec(
name="X2",
distribution="normal",
parameters=[1.5, 0.5],
description="None",
description=None,
),
],
copulas=None,
Expand Down
2 changes: 1 addition & 1 deletion src/uqtestfuns/test_functions/sobol_g.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def _create_sobol_input(input_dimension: int) -> List[UnivDistSpec]:
name=f"X{i + 1}",
distribution="uniform",
parameters=[0.0, 1.0],
description="None",
description=None,
)
)

Expand Down
4 changes: 2 additions & 2 deletions src/uqtestfuns/test_functions/webster.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@
name="A",
distribution="uniform",
parameters=[1.0, 10.0],
description="None",
description=None,
),
UnivDistSpec(
name="B",
distribution="normal",
parameters=[2.0, 1.0],
description="None",
description=None,
),
],
copulas=None,
Expand Down
2 changes: 1 addition & 1 deletion src/uqtestfuns/test_functions/welch1992.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
name=f"x{i}",
distribution="uniform",
parameters=[-0.5, 0.5],
description="None",
description=None,
)
for i in range(1, 20 + 1)
]
Expand Down
3 changes: 1 addition & 2 deletions tests/core/prob_input/test_multivariate_input.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import pytest
import numpy as np
from tabulate import tabulate
from typing import List, Any
from typing import List

from uqtestfuns.core.prob_input.probabilistic_input import ProbInput
from uqtestfuns.core.prob_input.univariate_distribution import UnivDist
Expand Down
3 changes: 1 addition & 2 deletions tests/metafun/test_uqmetatestfun.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,7 @@ def test_create_instance(uqmetafunspec):

# Assertions
assert (
my_metafun.metafun_spec.input_dimension
== my_args["input_dimension"]
my_metafun.metafun_spec.input_dimension == my_args["input_dimension"]
)
assert (
my_metafun.metafun_spec.basis_functions == my_args["basis_functions"]
Expand Down

0 comments on commit 836c598

Please sign in to comment.