diff --git a/rrompy/utilities/base/types.py b/rrompy/utilities/base/types.py index 15fdaef..127aa2e 100644 --- a/rrompy/utilities/base/types.py +++ b/rrompy/utilities/base/types.py @@ -1,53 +1,54 @@ # Copyright (C) 2018 by the RROMPy authors # # This file is part of RROMPy. # # RROMPy is free software: you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # RROMPy is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public License # along with RROMPy. If not, see . # from typing import TypeVar, List, Tuple, Dict, Any __all__ = ['TupleAny','ListAny','DictAny','ScOp','Np1D','Np2D','Np1DLst', 'N2FSExpr','FenExpr','FenFunc','FenFuncSpace','HFEng','ROMEng', - 'sampleEng','normEng','GenExpr','strLst','BfSExpr'] + 'sampleEng','normEng','paramVal','GenExpr','strLst','BfSExpr'] # ANY TupleAny = Tuple[Any] ListAny = List[Any] DictAny = Dict[Any, Any] # SCIPY ScOp = TypeVar("Scipy sparse matrix for space operator") # NUMPY Np1D = TypeVar("NumPy 1D array") Np2D = TypeVar("NumPy 2D array-like") Np1DLst = TypeVar("NumPy 1D array or list of NumPy 1D array") N2FSExpr = TypeVar("NumPy 2D array, float or str") # FENICS FenExpr = TypeVar("FEniCS expression") FenFunc = TypeVar("FEniCS function") FenFuncSpace = TypeVar("FEniCS function space") # ENGINES HFEng = TypeVar("High fidelity engine") ROMEng = TypeVar("ROM engine") sampleEng = TypeVar("Sampling engine") normEng = TypeVar("Norm engine") # OTHERS +paramVal = TypeVar("Parameter value tuple") GenExpr = TypeVar("Generic expression") strLst = TypeVar("str or list of str") BfSExpr = TypeVar("Boolean function or string") diff --git a/rrompy/utilities/exception_manager/mode_assert.py b/rrompy/utilities/exception_manager/mode_assert.py index 1050376..641c5eb 100644 --- a/rrompy/utilities/exception_manager/mode_assert.py +++ b/rrompy/utilities/exception_manager/mode_assert.py @@ -1,35 +1,35 @@ # Copyright (C) 2018 by the RROMPy authors # # This file is part of RROMPy. # # RROMPy is free software: you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # RROMPy is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public License # along with RROMPy. If not, see . # from rrompy.utilities.exception_manager import RROMPyException -__all__ = ['RROMPy_READY', 'RROMPy_FRAGILE', 'purgeList'] +__all__ = ['RROMPy_READY', 'RROMPy_FRAGILE', 'modeAssert'] RROMPy_READY = "ready" RROMPy_FRAGILE = "fragile" def modeAssert(mode, check = RROMPy_READY, message = ""): if isinstance(check, (tuple, list,)): if mode not in check: raise RROMPyException("Current mode not in {}. {}".format(check, message)) else: if mode != check: raise RROMPyException("Current mode not {}. {}".format(check, message))