From 09ecc8e6096016e0c62b6b8dea9822e613e27ebc Mon Sep 17 00:00:00 2001 From: Stefano Date: Mon, 13 Mar 2023 10:45:30 +0100 Subject: [PATCH] Removed common.py --- src/hippopt/base/optimization_object.py | 8 +++++++- src/hippopt/base/parameter.py | 4 +++- src/hippopt/base/variable.py | 4 +++- src/hippopt/common.py | 19 ------------------- 4 files changed, 13 insertions(+), 22 deletions(-) delete mode 100644 src/hippopt/common.py diff --git a/src/hippopt/base/optimization_object.py b/src/hippopt/base/optimization_object.py index 11e4b688..ea410ecd 100644 --- a/src/hippopt/base/optimization_object.py +++ b/src/hippopt/base/optimization_object.py @@ -1,4 +1,10 @@ -from hippopt.common import Any, ClassVar, Type, TypeVar, abc, copy, cs, dataclasses, np +import abc +import copy +import dataclasses +from typing import Any, ClassVar, Type, TypeVar + +import casadi as cs +import numpy as np TOptimizationObject = TypeVar("TOptimizationObject", bound="OptimizationObject") StorageType = cs.MX | np.ndarray diff --git a/src/hippopt/base/parameter.py b/src/hippopt/base/parameter.py index 79ae6b8f..6d1db6a0 100644 --- a/src/hippopt/base/parameter.py +++ b/src/hippopt/base/parameter.py @@ -1,5 +1,7 @@ +import dataclasses +from typing import Any, ClassVar, TypeVar + from hippopt.base.optimization_object import OptimizationObject -from hippopt.common import Any, ClassVar, TypeVar, dataclasses TParameter = TypeVar("TParameter", bound="Parameter") diff --git a/src/hippopt/base/variable.py b/src/hippopt/base/variable.py index 082f9aa1..64912985 100644 --- a/src/hippopt/base/variable.py +++ b/src/hippopt/base/variable.py @@ -1,5 +1,7 @@ +import dataclasses +from typing import Any, ClassVar, TypeVar + from hippopt.base.optimization_object import OptimizationObject -from hippopt.common import Any, ClassVar, TypeVar, dataclasses TVariable = TypeVar("TVariable", bound="Variable") diff --git a/src/hippopt/common.py b/src/hippopt/common.py deleted file mode 100644 index 761dffe0..00000000 --- a/src/hippopt/common.py +++ /dev/null @@ -1,19 +0,0 @@ -import abc -import copy -import dataclasses -from typing import Any, ClassVar, Type, TypeVar, Union - -import casadi as cs -import numpy as np - -__all__ = [ - "abc", - "copy", - "dataclasses", - "Any", - "ClassVar", - "Type", - "TypeVar", - "cs", - "np", -]