From 9e0dc8fc54fdf6160b5cc83e1fd20900eb13da87 Mon Sep 17 00:00:00 2001 From: giovanni Date: Wed, 18 Dec 2024 15:17:59 +0100 Subject: [PATCH] sort variables in operations --- pina/domain/operation_interface.py | 5 ++++- pina/domain/union_domain.py | 7 ------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/pina/domain/operation_interface.py b/pina/domain/operation_interface.py index 0300f52..e42d37e 100644 --- a/pina/domain/operation_interface.py +++ b/pina/domain/operation_interface.py @@ -43,7 +43,10 @@ class OperationInterface(DomainInterface, metaclass=ABCMeta): :return: All the variables defined in ``__init__`` in order. :rtype: list[str] """ - return self.geometries[0].variables + variables = [] + for geom in self.geometries: + variables += geom.variables + return sorted(list(set(variables))) @abstractmethod def is_inside(self, point, check_border=False): diff --git a/pina/domain/union_domain.py b/pina/domain/union_domain.py index 0af8e1b..91aa5fb 100644 --- a/pina/domain/union_domain.py +++ b/pina/domain/union_domain.py @@ -39,13 +39,6 @@ class Union(OperationInterface): set([geom.sample_modes for geom in self.geometries]) ) - @property - def variables(self): - variables = [] - for geom in self.geometries: - variables += geom.variables - return list(set(variables)) - def is_inside(self, point, check_border=False): """ Check if a point is inside the ``Union`` domain.