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

fixing bug (#300)

Browse Source 
Co-authored-by: Monthly Tag bot <mtbot@noreply.github.com>
This commit is contained in:
Dario Coscia
2024-05-20 17:45:44 +02:00
committed by GitHub
parent 4a6510bffd
commit a72ce67873
5 changed files with 39 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pina/geometry/cartesian.py
View File

@@ -36,7 +36,7 @@ class CartesianDomain(Location):
:return: Spatial variables defined in ``__init__()`` :return: Spatial variables defined in ``__init__()``
:rtype: list[str] :rtype: list[str]
""" """
return list(self.fixed_.keys()) + list(self.range_.keys()) return sorted(list(self.fixed_.keys()) + list(self.range_.keys()))
def update(self, new_domain): def update(self, new_domain):
"""Adding new dimensions on the ``CartesianDomain`` """Adding new dimensions on the ``CartesianDomain``

4
pina/geometry/ellipsoid.py
View File

@@ -78,7 +78,7 @@ class EllipsoidDomain(Location):
:return: Spatial variables defined in '__init__()' :return: Spatial variables defined in '__init__()'
:rtype: list[str] :rtype: list[str]
""" """
return list(self.fixed_.keys()) + list(self.range_.keys()) return sorted(list(self.fixed_.keys()) + list(self.range_.keys()))
def is_inside(self, point, check_border=False): def is_inside(self, point, check_border=False):
"""Check if a point is inside the ellipsoid domain. """Check if a point is inside the ellipsoid domain.
@@ -279,7 +279,7 @@ class EllipsoidDomain(Location):
return _single_points_sample(n, variables) return _single_points_sample(n, variables)
if variables == "all": if variables == "all":
variables = list(self.range_.keys()) + list(self.fixed_.keys()) variables = self.variables
if mode in ["random"]: if mode in ["random"]:
return _Nd_sampler(n, mode, variables) return _Nd_sampler(n, mode, variables)

2
pina/geometry/simplex.py
View File

@@ -76,7 +76,7 @@ class SimplexDomain(Location):
@property @property
def variables(self): def variables(self):
return self._vertices_matrix.labels return sorted(self._vertices_matrix.labels)
def _build_cartesian(self, vertices): def _build_cartesian(self, vertices):
""" """

3
pina/problem/abstract_problem.py
View File

@@ -237,6 +237,9 @@ class AbstractProblem(metaclass=ABCMeta):
self.input_variables self.input_variables
): ):
self._have_sampled_points[location] = True self._have_sampled_points[location] = True
self.input_pts[location] = self.input_pts[location].extract(
sorted(self.input_variables)
)
def add_points(self, new_points): def add_points(self, new_points):
""" """

53
tests/test_problem.py
View File

@@ -67,12 +67,9 @@ class Poisson(SpatialProblem):
truth_solution = poisson_sol truth_solution = poisson_sol
# make the problem
poisson_problem = Poisson()
def test_discretise_domain(): def test_discretise_domain():
n = 10 n = 10
poisson_problem = Poisson()
boundaries = ['gamma1', 'gamma2', 'gamma3', 'gamma4'] boundaries = ['gamma1', 'gamma2', 'gamma3', 'gamma4']
poisson_problem.discretise_domain(n, 'grid', locations=boundaries) poisson_problem.discretise_domain(n, 'grid', locations=boundaries)
for b in boundaries: for b in boundaries:
@@ -95,6 +92,7 @@ def test_discretise_domain():
def test_sampling_few_variables(): def test_sampling_few_variables():
n = 10 n = 10
poisson_problem = Poisson()
poisson_problem.discretise_domain(n, poisson_problem.discretise_domain(n,
'grid', 'grid',
locations=['D'], locations=['D'],
@@ -103,20 +101,33 @@ def test_sampling_few_variables():
assert poisson_problem._have_sampled_points['D'] is False assert poisson_problem._have_sampled_points['D'] is False
# def test_sampling_all_args(): def test_variables_correct_order_sampling():
# n = 10 n = 10
# poisson_problem.discretise_domain(n, 'grid', locations=['D']) poisson_problem = Poisson()
poisson_problem.discretise_domain(n,
# def test_sampling_all_kwargs(): 'grid',
# n = 10 locations=['D'],
# poisson_problem.discretise_domain(n=n, mode='latin', locations=['D']) variables=['x'])
poisson_problem.discretise_domain(n,
# def test_sampling_dict(): 'grid',
# n = 10 locations=['D'],
# poisson_problem.discretise_domain( variables=['y'])
# {'variables': ['x', 'y'], 'mode': 'grid', 'n': n}, locations=['D']) assert poisson_problem.input_pts['D'].labels == sorted(
poisson_problem.input_variables)
# def test_sampling_mixed_args_kwargs():
# n = 10 poisson_problem.discretise_domain(n,
# with pytest.raises(ValueError): 'grid',
# poisson_problem.discretise_domain(n, mode='latin', locations=['D']) locations=['D'])
assert poisson_problem.input_pts['D'].labels == sorted(
poisson_problem.input_variables)
poisson_problem.discretise_domain(n,
'grid',
locations=['D'],
variables=['y'])
poisson_problem.discretise_domain(n,
'grid',
locations=['D'],
variables=['x'])
assert poisson_problem.input_pts['D'].labels == sorted(
poisson_problem.input_variables)