From dd3fd3a82e096221b730462360307a55a26c3d4e Mon Sep 17 00:00:00 2001 From: Dimitris Tsapetis Date: Tue, 16 Mar 2021 08:52:01 -0400 Subject: [PATCH] Turns relative imports into absolute ones --- .../SubsetSimulation/Example3/Rosenbrock.py | 2 +- src/UQpy/DimensionReduction/DiffusionMaps.py | 6 +- src/UQpy/DimensionReduction/DirectPOD.py | 2 +- src/UQpy/DimensionReduction/Grassmann.py | 4 +- src/UQpy/DimensionReduction/HOSVD.py | 2 +- src/UQpy/DimensionReduction/SnapshotPOD.py | 2 +- src/UQpy/DimensionReduction/__init__.py | 10 +- .../DimensionReduction/baseclass/__init__.py | 2 +- src/UQpy/Distributions/__init__.py | 6 +- src/UQpy/Distributions/baseclass/Copula.py | 3 - .../Distributions/baseclass/Distribution.py | 4 - .../baseclass/DistributionContinuous1D.py | 3 +- .../baseclass/DistributionDiscrete1D.py | 4 +- .../Distributions/baseclass/DistributionND.py | 3 - src/UQpy/Distributions/baseclass/__init__.py | 10 +- src/UQpy/Distributions/collection/__init__.py | 46 +++---- src/UQpy/Distributions/collection/beta.py | 5 +- src/UQpy/Distributions/collection/binomial.py | 5 +- src/UQpy/Distributions/collection/cauchy.py | 5 +- .../Distributions/collection/chi_square.py | 5 +- .../Distributions/collection/exponential.py | 5 +- src/UQpy/Distributions/collection/gamma.py | 5 +- .../Distributions/collection/gen_extreme.py | 5 +- .../Distributions/collection/inverse_gauss.py | 5 +- .../Distributions/collection/joint_copula.py | 5 +- .../Distributions/collection/joint_ind.py | 4 +- src/UQpy/Distributions/collection/laplace.py | 5 +- src/UQpy/Distributions/collection/levy.py | 5 +- src/UQpy/Distributions/collection/logistic.py | 4 +- .../Distributions/collection/lognormal.py | 5 +- src/UQpy/Distributions/collection/maxwell.py | 5 +- .../Distributions/collection/multinomial.py | 4 +- src/UQpy/Distributions/collection/mvnormal.py | 4 +- src/UQpy/Distributions/collection/normal.py | 4 +- src/UQpy/Distributions/collection/pareto.py | 5 +- src/UQpy/Distributions/collection/poisson.py | 5 +- src/UQpy/Distributions/collection/rayleigh.py | 5 +- .../collection/truncated_normal.py | 4 +- src/UQpy/Distributions/collection/uniform.py | 5 +- src/UQpy/Distributions/copulas/__init__.py | 6 +- src/UQpy/Distributions/copulas/clayton.py | 4 +- src/UQpy/Distributions/copulas/frank.py | 5 +- src/UQpy/Distributions/copulas/gumbel.py | 20 +-- src/UQpy/Inference/BayesModelSelection.py | 8 +- .../Inference/BayesParameterEstimation.py | 6 +- src/UQpy/Inference/InferenceModel.py | 6 +- src/UQpy/Inference/InfoModelSelection.py | 7 +- src/UQpy/Inference/MLEstimation.py | 6 +- src/UQpy/Inference/__init__.py | 20 +-- src/UQpy/Reliability/SubsetSimulation.py | 9 +- src/UQpy/Reliability/TaylorSeries/FORM.py | 8 +- src/UQpy/Reliability/TaylorSeries/SORM.py | 9 +- .../Reliability/TaylorSeries/TaylorSeries.py | 2 +- src/UQpy/Reliability/TaylorSeries/__init__.py | 6 +- src/UQpy/Reliability/__init__.py | 4 +- src/UQpy/SampleMethods/AKMCS.py | 7 +- src/UQpy/SampleMethods/MCMC/DRAM.py | 2 +- src/UQpy/SampleMethods/MCMC/DREAM.py | 2 +- src/UQpy/SampleMethods/MCMC/MH.py | 2 +- src/UQpy/SampleMethods/MCMC/MMH.py | 2 +- src/UQpy/SampleMethods/MCMC/Stretch.py | 2 +- src/UQpy/SampleMethods/MCMC/__init__.py | 12 +- src/UQpy/SampleMethods/RSS/__init__.py | 6 +- src/UQpy/SampleMethods/RSS/rectangular.py | 4 +- src/UQpy/SampleMethods/RSS/rss.py | 2 +- src/UQpy/SampleMethods/RSS/voronoi.py | 9 +- src/UQpy/SampleMethods/STS/__init__.py | 8 +- src/UQpy/SampleMethods/STS/delaunay.py | 9 +- src/UQpy/SampleMethods/STS/rectangular.py | 4 +- src/UQpy/SampleMethods/STS/voronoi.py | 8 +- src/UQpy/SampleMethods/Simplex.py | 1 - src/UQpy/SampleMethods/Strata/__init__.py | 8 +- src/UQpy/SampleMethods/Strata/delaunay.py | 5 +- src/UQpy/SampleMethods/Strata/rectangular.py | 5 +- src/UQpy/SampleMethods/Strata/strata.py | 2 +- src/UQpy/SampleMethods/Strata/voronoi.py | 5 +- src/UQpy/SampleMethods/__init__.py | 20 +-- src/UQpy/Sensitivity/__init__.py | 5 +- src/UQpy/StochasticProcess/BSRM.py | 6 +- .../StochasticProcess/InverseTranslation.py | 5 +- src/UQpy/StochasticProcess/KLE.py | 6 +- src/UQpy/StochasticProcess/SRM.py | 5 - src/UQpy/StochasticProcess/Translation.py | 11 +- src/UQpy/StochasticProcess/__init__.py | 10 +- .../StochasticProcess/supportive/__init__.py | 6 +- src/UQpy/Surrogates/Kriging/Kriging.py | 25 ++-- src/UQpy/Surrogates/Kriging/__init__.py | 2 +- src/UQpy/Surrogates/__init__.py | 6 +- src/UQpy/Surrogates/pce/PCE.py | 8 +- src/UQpy/Surrogates/pce/Polynomials.py | 118 +----------------- src/UQpy/Surrogates/pce/__init__.py | 14 +-- .../Surrogates/pce/polynomials/Hermite.py | 4 +- .../Surrogates/pce/polynomials/Legendre.py | 7 +- .../Surrogates/pce/polynomials/__init__.py | 4 +- src/UQpy/Utilities.py | 2 +- tests/test_PCE.py | 2 - 96 files changed, 252 insertions(+), 463 deletions(-) diff --git a/example/Reliability/SubsetSimulation/Example3/Rosenbrock.py b/example/Reliability/SubsetSimulation/Example3/Rosenbrock.py index c8d01dd4a..67494981d 100644 --- a/example/Reliability/SubsetSimulation/Example3/Rosenbrock.py +++ b/example/Reliability/SubsetSimulation/Example3/Rosenbrock.py @@ -1,5 +1,5 @@ from UQpy.Distributions import DistributionND - +import numpy as np class Rosenbrock(DistributionND): def __init__(self, p=20.): diff --git a/src/UQpy/DimensionReduction/DiffusionMaps.py b/src/UQpy/DimensionReduction/DiffusionMaps.py index 8b8cd2f8b..d968d6378 100644 --- a/src/UQpy/DimensionReduction/DiffusionMaps.py +++ b/src/UQpy/DimensionReduction/DiffusionMaps.py @@ -6,14 +6,14 @@ from sklearn.preprocessing import normalize from UQpy.Utilities import * import functools -from .Grassmann import Grassmann +from UQpy.DimensionReduction.Grassmann import Grassmann import scipy.sparse as sps import scipy.sparse.linalg as spsl import scipy.spatial.distance as sd from scipy.interpolate import LinearNDInterpolator -from ..Utilities import _nn_coord -from ..Surrogates import Kriging +from UQpy.Utilities import _nn_coord +from UQpy.Surrogates.Kriging import Kriging ######################################################################################################################## ######################################################################################################################## diff --git a/src/UQpy/DimensionReduction/DirectPOD.py b/src/UQpy/DimensionReduction/DirectPOD.py index cf491a282..6a235f7ff 100644 --- a/src/UQpy/DimensionReduction/DirectPOD.py +++ b/src/UQpy/DimensionReduction/DirectPOD.py @@ -1,5 +1,5 @@ import numpy as np -from .baseclass import POD +from UQpy.DimensionReduction.baseclass import POD ######################################################################################################################## ######################################################################################################################## diff --git a/src/UQpy/DimensionReduction/Grassmann.py b/src/UQpy/DimensionReduction/Grassmann.py index 0534f9e7b..8664c54ca 100644 --- a/src/UQpy/DimensionReduction/Grassmann.py +++ b/src/UQpy/DimensionReduction/Grassmann.py @@ -3,7 +3,7 @@ import numpy as np from sklearn.preprocessing import normalize -from ..Utilities import * +from UQpy.Utilities import * import functools import scipy.sparse as sps @@ -11,7 +11,7 @@ import scipy.spatial.distance as sd from scipy.interpolate import LinearNDInterpolator -from ..Surrogates import Kriging +from UQpy.Surrogates import Kriging ######################################################################################################################## diff --git a/src/UQpy/DimensionReduction/HOSVD.py b/src/UQpy/DimensionReduction/HOSVD.py index f3d4a003e..d86889ff5 100644 --- a/src/UQpy/DimensionReduction/HOSVD.py +++ b/src/UQpy/DimensionReduction/HOSVD.py @@ -1,5 +1,5 @@ import numpy as np -from .baseclass import POD +from UQpy.DimensionReduction.baseclass import POD ######################################################################################################################## ######################################################################################################################## diff --git a/src/UQpy/DimensionReduction/SnapshotPOD.py b/src/UQpy/DimensionReduction/SnapshotPOD.py index 8c1148ce7..2c8416447 100644 --- a/src/UQpy/DimensionReduction/SnapshotPOD.py +++ b/src/UQpy/DimensionReduction/SnapshotPOD.py @@ -1,5 +1,5 @@ import numpy as np -from .baseclass import POD +from UQpy.DimensionReduction.baseclass import POD ######################################################################################################################## ######################################################################################################################## diff --git a/src/UQpy/DimensionReduction/__init__.py b/src/UQpy/DimensionReduction/__init__.py index 3db3944f8..76105f2c1 100644 --- a/src/UQpy/DimensionReduction/__init__.py +++ b/src/UQpy/DimensionReduction/__init__.py @@ -33,11 +33,11 @@ """ -from .DiffusionMaps import DiffusionMaps -from .Grassmann import Grassmann -from .DirectPOD import DirectPOD -from .SnapshotPOD import SnapshotPOD -from .HOSVD import HOSVD +from UQpy.DimensionReduction.DiffusionMaps import DiffusionMaps +from UQpy.DimensionReduction.Grassmann import Grassmann +from UQpy.DimensionReduction.DirectPOD import DirectPOD +from UQpy.DimensionReduction.SnapshotPOD import SnapshotPOD +from UQpy.DimensionReduction.HOSVD import HOSVD diff --git a/src/UQpy/DimensionReduction/baseclass/__init__.py b/src/UQpy/DimensionReduction/baseclass/__init__.py index 799af8b1e..778b71f03 100644 --- a/src/UQpy/DimensionReduction/baseclass/__init__.py +++ b/src/UQpy/DimensionReduction/baseclass/__init__.py @@ -1,3 +1,3 @@ """Collection of baseclasses""" -from .POD import POD +from UQpy.DimensionReduction.baseclass.POD import POD diff --git a/src/UQpy/Distributions/__init__.py b/src/UQpy/Distributions/__init__.py index 6fcd12d4a..774ef21ee 100644 --- a/src/UQpy/Distributions/__init__.py +++ b/src/UQpy/Distributions/__init__.py @@ -36,9 +36,9 @@ # pylint: disable=wildcard-import -from .baseclass import * -from .copulas import * -from .collection import * +from UQpy.Distributions.baseclass import * +from UQpy.Distributions.copulas import * +from UQpy.Distributions.collection import * from . import ( baseclass, copulas, collection diff --git a/src/UQpy/Distributions/baseclass/Copula.py b/src/UQpy/Distributions/baseclass/Copula.py index 86d1eb8df..e5bd13434 100644 --- a/src/UQpy/Distributions/baseclass/Copula.py +++ b/src/UQpy/Distributions/baseclass/Copula.py @@ -1,6 +1,3 @@ -from types import MethodType -import numpy as np -import scipy.stats as stats ######################################################################################################################## # Copulas ######################################################################################################################## diff --git a/src/UQpy/Distributions/baseclass/Distribution.py b/src/UQpy/Distributions/baseclass/Distribution.py index 8ff6d88f2..3917f57cb 100644 --- a/src/UQpy/Distributions/baseclass/Distribution.py +++ b/src/UQpy/Distributions/baseclass/Distribution.py @@ -1,7 +1,3 @@ -from types import MethodType -import numpy as np -import scipy.stats as stats - ######################################################################################################################## # Define the probability distribution of the random parameters ######################################################################################################################## diff --git a/src/UQpy/Distributions/baseclass/DistributionContinuous1D.py b/src/UQpy/Distributions/baseclass/DistributionContinuous1D.py index f6a383306..00dca9fcf 100644 --- a/src/UQpy/Distributions/baseclass/DistributionContinuous1D.py +++ b/src/UQpy/Distributions/baseclass/DistributionContinuous1D.py @@ -1,8 +1,7 @@ -from types import MethodType import numpy as np import scipy.stats as stats +from UQpy.Distributions.baseclass.Distribution import Distribution -from .Distribution import Distribution class DistributionContinuous1D(Distribution): """ diff --git a/src/UQpy/Distributions/baseclass/DistributionDiscrete1D.py b/src/UQpy/Distributions/baseclass/DistributionDiscrete1D.py index 7a9a52613..42421b267 100644 --- a/src/UQpy/Distributions/baseclass/DistributionDiscrete1D.py +++ b/src/UQpy/Distributions/baseclass/DistributionDiscrete1D.py @@ -1,8 +1,6 @@ -from types import MethodType import numpy as np import scipy.stats as stats - -from .Distribution import Distribution +from UQpy.Distributions.baseclass.Distribution import Distribution ######################################################################################################################## # Univariate Discrete Distributions diff --git a/src/UQpy/Distributions/baseclass/DistributionND.py b/src/UQpy/Distributions/baseclass/DistributionND.py index 8d30602e1..df0370649 100644 --- a/src/UQpy/Distributions/baseclass/DistributionND.py +++ b/src/UQpy/Distributions/baseclass/DistributionND.py @@ -1,7 +1,4 @@ -from types import MethodType import numpy as np -import scipy.stats as stats - from .Distribution import Distribution ######################################################################################################################## diff --git a/src/UQpy/Distributions/baseclass/__init__.py b/src/UQpy/Distributions/baseclass/__init__.py index 7781140e9..83ff58989 100644 --- a/src/UQpy/Distributions/baseclass/__init__.py +++ b/src/UQpy/Distributions/baseclass/__init__.py @@ -1,7 +1,7 @@ """Collection of baseclasses.""" -from .Distribution import Distribution -from .DistributionContinuous1D import DistributionContinuous1D -from .DistributionDiscrete1D import DistributionDiscrete1D -from .DistributionND import DistributionND -from .Copula import Copula +from UQpy.Distributions.baseclass.Distribution import Distribution +from UQpy.Distributions.baseclass.DistributionContinuous1D import DistributionContinuous1D +from UQpy.Distributions.baseclass.DistributionDiscrete1D import DistributionDiscrete1D +from UQpy.Distributions.baseclass.DistributionND import DistributionND +from UQpy.Distributions.baseclass.Copula import Copula diff --git a/src/UQpy/Distributions/collection/__init__.py b/src/UQpy/Distributions/collection/__init__.py index 2c6ad77a8..7685cfc16 100644 --- a/src/UQpy/Distributions/collection/__init__.py +++ b/src/UQpy/Distributions/collection/__init__.py @@ -1,24 +1,24 @@ """Distributions module.""" -from .beta import Beta -from .binomial import Binomial -from .cauchy import Cauchy -from .chi_square import ChiSquare -from .exponential import Exponential -from .gamma import Gamma -from .gen_extreme import GenExtreme -from .inverse_gauss import InvGauss -from .laplace import Laplace -from .levy import Levy -from .logistic import Logistic -from .lognormal import Lognormal -from .maxwell import Maxwell -from .multinomial import Multinomial -from .mvnormal import MVNormal -from .normal import Normal -from .pareto import Pareto -from .poisson import Poisson -from .rayleigh import Rayleigh -from .truncated_normal import TruncNorm -from .uniform import Uniform -from .joint_ind import JointInd -from .joint_copula import JointCopula +from UQpy.Distributions.collection.beta import Beta +from UQpy.Distributions.collection.binomial import Binomial +from UQpy.Distributions.collection.cauchy import Cauchy +from UQpy.Distributions.collection.chi_square import ChiSquare +from UQpy.Distributions.collection.exponential import Exponential +from UQpy.Distributions.collection.gamma import Gamma +from UQpy.Distributions.collection.gen_extreme import GenExtreme +from UQpy.Distributions.collection.inverse_gauss import InvGauss +from UQpy.Distributions.collection.laplace import Laplace +from UQpy.Distributions.collection.levy import Levy +from UQpy.Distributions.collection.logistic import Logistic +from UQpy.Distributions.collection.lognormal import Lognormal +from UQpy.Distributions.collection.maxwell import Maxwell +from UQpy.Distributions.collection.multinomial import Multinomial +from UQpy.Distributions.collection.mvnormal import MVNormal +from UQpy.Distributions.collection.normal import Normal +from UQpy.Distributions.collection.pareto import Pareto +from UQpy.Distributions.collection.poisson import Poisson +from UQpy.Distributions.collection.rayleigh import Rayleigh +from UQpy.Distributions.collection.truncated_normal import TruncNorm +from UQpy.Distributions.collection.uniform import Uniform +from UQpy.Distributions.collection.joint_ind import JointInd +from UQpy.Distributions.collection.joint_copula import JointCopula diff --git a/src/UQpy/Distributions/collection/beta.py b/src/UQpy/Distributions/collection/beta.py index 5feab1073..92633e9e0 100644 --- a/src/UQpy/Distributions/collection/beta.py +++ b/src/UQpy/Distributions/collection/beta.py @@ -1,8 +1,5 @@ -from types import MethodType -import numpy as np import scipy.stats as stats - -from ..baseclass import DistributionContinuous1D +from UQpy.Distributions.baseclass import DistributionContinuous1D class Beta(DistributionContinuous1D): """ diff --git a/src/UQpy/Distributions/collection/binomial.py b/src/UQpy/Distributions/collection/binomial.py index 07b51da6a..905e33b98 100644 --- a/src/UQpy/Distributions/collection/binomial.py +++ b/src/UQpy/Distributions/collection/binomial.py @@ -1,8 +1,5 @@ -from types import MethodType -import numpy as np import scipy.stats as stats - -from ..baseclass import DistributionDiscrete1D +from UQpy.Distributions.baseclass import DistributionDiscrete1D class Binomial(DistributionDiscrete1D): """ diff --git a/src/UQpy/Distributions/collection/cauchy.py b/src/UQpy/Distributions/collection/cauchy.py index fcdc93891..fe59f3f0b 100644 --- a/src/UQpy/Distributions/collection/cauchy.py +++ b/src/UQpy/Distributions/collection/cauchy.py @@ -1,8 +1,5 @@ -from types import MethodType -import numpy as np import scipy.stats as stats - -from ..baseclass import DistributionContinuous1D +from UQpy.Distributions.baseclass import DistributionContinuous1D class Cauchy(DistributionContinuous1D): """ diff --git a/src/UQpy/Distributions/collection/chi_square.py b/src/UQpy/Distributions/collection/chi_square.py index 9c9fc3789..d82769d87 100644 --- a/src/UQpy/Distributions/collection/chi_square.py +++ b/src/UQpy/Distributions/collection/chi_square.py @@ -1,8 +1,5 @@ -from types import MethodType -import numpy as np import scipy.stats as stats - -from ..baseclass import DistributionContinuous1D +from UQpy.Distributions.baseclass import DistributionContinuous1D class ChiSquare(DistributionContinuous1D): """ diff --git a/src/UQpy/Distributions/collection/exponential.py b/src/UQpy/Distributions/collection/exponential.py index c35676bf5..3bd53ab07 100644 --- a/src/UQpy/Distributions/collection/exponential.py +++ b/src/UQpy/Distributions/collection/exponential.py @@ -1,8 +1,5 @@ -from types import MethodType -import numpy as np import scipy.stats as stats - -from ..baseclass import DistributionContinuous1D +from UQpy.Distributions.baseclass import DistributionContinuous1D class Exponential(DistributionContinuous1D): """ diff --git a/src/UQpy/Distributions/collection/gamma.py b/src/UQpy/Distributions/collection/gamma.py index 6d7f03ed8..a88e5bb24 100644 --- a/src/UQpy/Distributions/collection/gamma.py +++ b/src/UQpy/Distributions/collection/gamma.py @@ -1,8 +1,5 @@ -from types import MethodType -import numpy as np import scipy.stats as stats - -from ..baseclass import DistributionContinuous1D +from UQpy.Distributions.baseclass import DistributionContinuous1D class Gamma(DistributionContinuous1D): """ diff --git a/src/UQpy/Distributions/collection/gen_extreme.py b/src/UQpy/Distributions/collection/gen_extreme.py index e99e65c93..5f87d4278 100644 --- a/src/UQpy/Distributions/collection/gen_extreme.py +++ b/src/UQpy/Distributions/collection/gen_extreme.py @@ -1,8 +1,5 @@ -from types import MethodType -import numpy as np import scipy.stats as stats - -from ..baseclass import DistributionContinuous1D +from UQpy.Distributions.baseclass import DistributionContinuous1D class GenExtreme(DistributionContinuous1D): """ diff --git a/src/UQpy/Distributions/collection/inverse_gauss.py b/src/UQpy/Distributions/collection/inverse_gauss.py index 6e5f7b3f2..ade0e910d 100644 --- a/src/UQpy/Distributions/collection/inverse_gauss.py +++ b/src/UQpy/Distributions/collection/inverse_gauss.py @@ -1,8 +1,5 @@ -from types import MethodType -import numpy as np import scipy.stats as stats - -from ..baseclass import DistributionContinuous1D +from UQpy.Distributions.baseclass import DistributionContinuous1D class InvGauss(DistributionContinuous1D): """ diff --git a/src/UQpy/Distributions/collection/joint_copula.py b/src/UQpy/Distributions/collection/joint_copula.py index aa695a571..5b695cae5 100644 --- a/src/UQpy/Distributions/collection/joint_copula.py +++ b/src/UQpy/Distributions/collection/joint_copula.py @@ -1,9 +1,8 @@ from types import MethodType import numpy as np -import scipy.stats as stats -from ..baseclass import Copula -from ..baseclass import DistributionContinuous1D, DistributionND, DistributionDiscrete1D +from UQpy.Distributions.baseclass import Copula +from UQpy.Distributions.baseclass import DistributionContinuous1D, DistributionND, DistributionDiscrete1D ######################################################################################################################## diff --git a/src/UQpy/Distributions/collection/joint_ind.py b/src/UQpy/Distributions/collection/joint_ind.py index 4b7e3eb54..de8d36e1a 100644 --- a/src/UQpy/Distributions/collection/joint_ind.py +++ b/src/UQpy/Distributions/collection/joint_ind.py @@ -1,8 +1,6 @@ from types import MethodType import numpy as np -import scipy.stats as stats - -from ..baseclass import DistributionContinuous1D, DistributionND, DistributionDiscrete1D +from UQpy.Distributions.baseclass import DistributionContinuous1D, DistributionND, DistributionDiscrete1D ######################################################################################################################## diff --git a/src/UQpy/Distributions/collection/laplace.py b/src/UQpy/Distributions/collection/laplace.py index 32ebacf47..c0657a1e7 100644 --- a/src/UQpy/Distributions/collection/laplace.py +++ b/src/UQpy/Distributions/collection/laplace.py @@ -1,8 +1,5 @@ -from types import MethodType -import numpy as np import scipy.stats as stats - -from ..baseclass import DistributionContinuous1D +from UQpy.Distributions.baseclass import DistributionContinuous1D class Laplace(DistributionContinuous1D): """ diff --git a/src/UQpy/Distributions/collection/levy.py b/src/UQpy/Distributions/collection/levy.py index 5124a7cae..56f2bf641 100644 --- a/src/UQpy/Distributions/collection/levy.py +++ b/src/UQpy/Distributions/collection/levy.py @@ -1,8 +1,5 @@ -from types import MethodType -import numpy as np import scipy.stats as stats - -from ..baseclass import DistributionContinuous1D +from UQpy.Distributions.baseclass import DistributionContinuous1D class Levy(DistributionContinuous1D): """ diff --git a/src/UQpy/Distributions/collection/logistic.py b/src/UQpy/Distributions/collection/logistic.py index 6ad9d1b8a..606feaac4 100644 --- a/src/UQpy/Distributions/collection/logistic.py +++ b/src/UQpy/Distributions/collection/logistic.py @@ -1,8 +1,6 @@ -from types import MethodType -import numpy as np import scipy.stats as stats -from ..baseclass import DistributionContinuous1D +from UQpy.Distributions.baseclass import DistributionContinuous1D class Logistic(DistributionContinuous1D): """ diff --git a/src/UQpy/Distributions/collection/lognormal.py b/src/UQpy/Distributions/collection/lognormal.py index 45fd4aadb..2f63a1c1f 100644 --- a/src/UQpy/Distributions/collection/lognormal.py +++ b/src/UQpy/Distributions/collection/lognormal.py @@ -1,8 +1,5 @@ -from types import MethodType -import numpy as np import scipy.stats as stats - -from ..baseclass import DistributionContinuous1D +from UQpy.Distributions.baseclass import DistributionContinuous1D class Lognormal(DistributionContinuous1D): """ diff --git a/src/UQpy/Distributions/collection/maxwell.py b/src/UQpy/Distributions/collection/maxwell.py index efdff41a7..a588ab518 100644 --- a/src/UQpy/Distributions/collection/maxwell.py +++ b/src/UQpy/Distributions/collection/maxwell.py @@ -1,8 +1,5 @@ -from types import MethodType -import numpy as np import scipy.stats as stats - -from ..baseclass import DistributionContinuous1D +from UQpy.Distributions.baseclass import DistributionContinuous1D class Maxwell(DistributionContinuous1D): """ diff --git a/src/UQpy/Distributions/collection/multinomial.py b/src/UQpy/Distributions/collection/multinomial.py index c39a306db..1960e77f6 100644 --- a/src/UQpy/Distributions/collection/multinomial.py +++ b/src/UQpy/Distributions/collection/multinomial.py @@ -1,8 +1,6 @@ -from types import MethodType import numpy as np import scipy.stats as stats - -from ..baseclass import DistributionND +from UQpy.Distributions.baseclass import DistributionND class Multinomial(DistributionND): """ diff --git a/src/UQpy/Distributions/collection/mvnormal.py b/src/UQpy/Distributions/collection/mvnormal.py index 7d0388b28..f464c34f7 100644 --- a/src/UQpy/Distributions/collection/mvnormal.py +++ b/src/UQpy/Distributions/collection/mvnormal.py @@ -1,8 +1,6 @@ -from types import MethodType import numpy as np import scipy.stats as stats - -from ..baseclass import DistributionND +from UQpy.Distributions.baseclass import DistributionND class MVNormal(DistributionND): """ diff --git a/src/UQpy/Distributions/collection/normal.py b/src/UQpy/Distributions/collection/normal.py index 28089a0b9..1319dff81 100644 --- a/src/UQpy/Distributions/collection/normal.py +++ b/src/UQpy/Distributions/collection/normal.py @@ -1,8 +1,6 @@ -from types import MethodType import numpy as np import scipy.stats as stats - -from ..baseclass import DistributionContinuous1D +from UQpy.Distributions.baseclass import DistributionContinuous1D class Normal(DistributionContinuous1D): """ diff --git a/src/UQpy/Distributions/collection/pareto.py b/src/UQpy/Distributions/collection/pareto.py index 408d8dc0f..e8e42d6c2 100644 --- a/src/UQpy/Distributions/collection/pareto.py +++ b/src/UQpy/Distributions/collection/pareto.py @@ -1,8 +1,5 @@ -from types import MethodType -import numpy as np import scipy.stats as stats - -from ..baseclass import DistributionContinuous1D +from UQpy.Distributions.baseclass import DistributionContinuous1D class Pareto(DistributionContinuous1D): """ diff --git a/src/UQpy/Distributions/collection/poisson.py b/src/UQpy/Distributions/collection/poisson.py index 12fe2b4ec..618650ede 100644 --- a/src/UQpy/Distributions/collection/poisson.py +++ b/src/UQpy/Distributions/collection/poisson.py @@ -1,8 +1,5 @@ -from types import MethodType -import numpy as np import scipy.stats as stats - -from ..baseclass import DistributionDiscrete1D +from UQpy.Distributions.baseclass import DistributionDiscrete1D class Poisson(DistributionDiscrete1D): """ diff --git a/src/UQpy/Distributions/collection/rayleigh.py b/src/UQpy/Distributions/collection/rayleigh.py index a2b4c5195..ef039e6af 100644 --- a/src/UQpy/Distributions/collection/rayleigh.py +++ b/src/UQpy/Distributions/collection/rayleigh.py @@ -1,8 +1,5 @@ -from types import MethodType -import numpy as np import scipy.stats as stats - -from ..baseclass import DistributionContinuous1D +from UQpy.Distributions.baseclass import DistributionContinuous1D class Rayleigh(DistributionContinuous1D): """ diff --git a/src/UQpy/Distributions/collection/truncated_normal.py b/src/UQpy/Distributions/collection/truncated_normal.py index e5e27d6fa..aa720f08f 100644 --- a/src/UQpy/Distributions/collection/truncated_normal.py +++ b/src/UQpy/Distributions/collection/truncated_normal.py @@ -1,8 +1,6 @@ -from types import MethodType -import numpy as np import scipy.stats as stats +from UQpy.Distributions.baseclass import DistributionContinuous1D -from ..baseclass import DistributionContinuous1D class TruncNorm(DistributionContinuous1D): """ diff --git a/src/UQpy/Distributions/collection/uniform.py b/src/UQpy/Distributions/collection/uniform.py index e81c59136..095456c95 100644 --- a/src/UQpy/Distributions/collection/uniform.py +++ b/src/UQpy/Distributions/collection/uniform.py @@ -1,8 +1,5 @@ -from types import MethodType -import numpy as np import scipy.stats as stats - -from ..baseclass import DistributionContinuous1D +from UQpy.Distributions.baseclass import DistributionContinuous1D class Uniform(DistributionContinuous1D): """ diff --git a/src/UQpy/Distributions/copulas/__init__.py b/src/UQpy/Distributions/copulas/__init__.py index 91f5a3aeb..29f0a521d 100644 --- a/src/UQpy/Distributions/copulas/__init__.py +++ b/src/UQpy/Distributions/copulas/__init__.py @@ -1,3 +1,3 @@ -from .gumbel import Gumbel -from .clayton import Clayton -from .frank import Frank +from UQpy.Distributions.copulas.gumbel import Gumbel +from UQpy.Distributions.copulas.clayton import Clayton +from UQpy.Distributions.copulas.frank import Frank diff --git a/src/UQpy/Distributions/copulas/clayton.py b/src/UQpy/Distributions/copulas/clayton.py index 1a994921c..ac863fb0b 100644 --- a/src/UQpy/Distributions/copulas/clayton.py +++ b/src/UQpy/Distributions/copulas/clayton.py @@ -1,5 +1,5 @@ -from ..baseclass import Copula -from ..baseclass import DistributionContinuous1D, DistributionND, DistributionDiscrete1D +from UQpy.Distributions.baseclass import Copula +from UQpy.Distributions.baseclass import DistributionContinuous1D, DistributionND, DistributionDiscrete1D import numpy as np class Clayton(Copula): diff --git a/src/UQpy/Distributions/copulas/frank.py b/src/UQpy/Distributions/copulas/frank.py index 4fdf7cd03..59e9be013 100644 --- a/src/UQpy/Distributions/copulas/frank.py +++ b/src/UQpy/Distributions/copulas/frank.py @@ -1,7 +1,8 @@ -from ..baseclass import Copula -from ..baseclass import DistributionContinuous1D, DistributionND, DistributionDiscrete1D import numpy as np +from UQpy.Distributions.baseclass import Copula +from UQpy.Distributions.baseclass import DistributionContinuous1D + class Frank(Copula): """ Frank copula having cumulative distribution function diff --git a/src/UQpy/Distributions/copulas/gumbel.py b/src/UQpy/Distributions/copulas/gumbel.py index 90b217537..23369545d 100644 --- a/src/UQpy/Distributions/copulas/gumbel.py +++ b/src/UQpy/Distributions/copulas/gumbel.py @@ -1,6 +1,6 @@ -from ..baseclass import Copula -from ..baseclass import DistributionContinuous1D, DistributionND, DistributionDiscrete1D -import numpy as np +from UQpy.Distributions.baseclass import Copula +from UQpy.Distributions.baseclass import DistributionContinuous1D +from numpy import prod, log, ones, exp class Gumbel(Copula): """ @@ -31,12 +31,12 @@ def evaluate_cdf(self, unif): if unif.shape[1] > 2: raise ValueError('Maximum dimension for the Gumbel Copula is 2.') if self.params['theta'] == 1: - return np.prod(unif, axis=1) + return prod(unif, axis=1) u = unif[:, 0] v = unif[:, 1] theta = self.params['theta'] - cdf_val = np.exp(-((-np.log(u)) ** theta + (-np.log(v)) ** theta) ** (1 / theta)) + cdf_val = exp(-((-log(u)) ** theta + (-log(v)) ** theta) ** (1 / theta)) return cdf_val @@ -44,16 +44,16 @@ def evaluate_pdf(self, unif): if unif.shape[1] > 2: raise ValueError('Maximum dimension for the Gumbel Copula is 2.') if self.params['theta'] == 1: - return np.ones(unif.shape[0]) + return ones(unif.shape[0]) u = unif[:, 0] v = unif[:, 1] theta = self.params['theta'] - c = np.exp(-((-np.log(u)) ** theta + (-np.log(v)) ** theta) ** (1 / theta)) + c = exp(-((-log(u)) ** theta + (-log(v)) ** theta) ** (1 / theta)) - pdf_val = c * 1 / u * 1 / v * ((-np.log(u)) ** theta + (-np.log(v)) ** theta) ** (-2 + 2 / theta) \ - * (np.log(u) * np.log(v)) ** (theta - 1) * \ - (1 + (theta - 1) * ((-np.log(u)) ** theta + (-np.log(v)) ** theta) ** (-1 / theta)) + pdf_val = c * 1 / u * 1 / v * ((-log(u)) ** theta + (-log(v)) ** theta) ** (-2 + 2 / theta) \ + * (log(u) * log(v)) ** (theta - 1) * \ + (1 + (theta - 1) * ((-log(u)) ** theta + (-log(v)) ** theta) ** (-1 / theta)) return pdf_val def check_marginals(self, marginals): diff --git a/src/UQpy/Inference/BayesModelSelection.py b/src/UQpy/Inference/BayesModelSelection.py index 070474eba..ee8bf0c84 100644 --- a/src/UQpy/Inference/BayesModelSelection.py +++ b/src/UQpy/Inference/BayesModelSelection.py @@ -1,10 +1,8 @@ import numpy as np -from ..Distributions import Distribution, Normal, MVNormal -from ..RunModel import RunModel -from ..SampleMethods import MCMC, IS -from .InferenceModel import InferenceModel -from .BayesParameterEstimation import BayesParameterEstimation +from UQpy.Inference.BayesParameterEstimation import BayesParameterEstimation +from UQpy.Inference.InferenceModel import InferenceModel + ######################################################################################################################## ######################################################################################################################## diff --git a/src/UQpy/Inference/BayesParameterEstimation.py b/src/UQpy/Inference/BayesParameterEstimation.py index d767e27ef..26cf430cc 100644 --- a/src/UQpy/Inference/BayesParameterEstimation.py +++ b/src/UQpy/Inference/BayesParameterEstimation.py @@ -1,9 +1,7 @@ import numpy as np -from ..Distributions import Distribution, Normal, MVNormal -from ..RunModel import RunModel -from ..SampleMethods import MCMC, IS -from .InferenceModel import InferenceModel +from UQpy.Inference.InferenceModel import InferenceModel +from UQpy.SampleMethods import MCMC, IS ######################################################################################################################## diff --git a/src/UQpy/Inference/InferenceModel.py b/src/UQpy/Inference/InferenceModel.py index d2f24fd71..a420920ba 100644 --- a/src/UQpy/Inference/InferenceModel.py +++ b/src/UQpy/Inference/InferenceModel.py @@ -1,9 +1,7 @@ import numpy as np -from ..Distributions import Distribution, Normal, MVNormal -from ..RunModel import RunModel -from ..SampleMethods import MCMC, IS - +from UQpy.Distributions import Distribution, Normal, MVNormal +from UQpy.RunModel import RunModel ######################################################################################################################## ######################################################################################################################## diff --git a/src/UQpy/Inference/InfoModelSelection.py b/src/UQpy/Inference/InfoModelSelection.py index abd445c11..0ad09e4ca 100644 --- a/src/UQpy/Inference/InfoModelSelection.py +++ b/src/UQpy/Inference/InfoModelSelection.py @@ -1,10 +1,7 @@ import numpy as np -from ..Distributions import Distribution, Normal, MVNormal -from ..RunModel import RunModel -from ..SampleMethods import MCMC, IS -from .InferenceModel import InferenceModel -from .MLEstimation import MLEstimation +from UQpy.Inference.InferenceModel import InferenceModel +from UQpy.Inference.MLEstimation import MLEstimation ######################################################################################################################## ######################################################################################################################## diff --git a/src/UQpy/Inference/MLEstimation.py b/src/UQpy/Inference/MLEstimation.py index 123a38538..fa63408aa 100644 --- a/src/UQpy/Inference/MLEstimation.py +++ b/src/UQpy/Inference/MLEstimation.py @@ -1,9 +1,7 @@ import numpy as np -from ..Distributions import Distribution, Normal, MVNormal -from ..RunModel import RunModel -from ..SampleMethods import MCMC, IS -from .InferenceModel import InferenceModel +from UQpy.Inference.InferenceModel import InferenceModel + ######################################################################################################################## ######################################################################################################################## diff --git a/src/UQpy/Inference/__init__.py b/src/UQpy/Inference/__init__.py index 379068516..5f79dd842 100644 --- a/src/UQpy/Inference/__init__.py +++ b/src/UQpy/Inference/__init__.py @@ -28,15 +28,15 @@ * ``BayesModelSelection``: Estimate model posterior probabilities. """ -from .BayesModelSelection import BayesModelSelection -from .InferenceModel import InferenceModel -from .InfoModelSelection import InfoModelSelection -from .BayesParameterEstimation import BayesParameterEstimation -from .MLEstimation import MLEstimation +from UQpy.Inference.BayesModelSelection import BayesModelSelection +from UQpy.Inference.InferenceModel import InferenceModel +from UQpy.Inference.InfoModelSelection import InfoModelSelection +from UQpy.Inference.BayesParameterEstimation import BayesParameterEstimation +from UQpy.Inference.MLEstimation import MLEstimation -from .BayesModelSelection import * -from .InferenceModel import * -from .InfoModelSelection import * -from .BayesParameterEstimation import * -from .MLEstimation import * +from UQpy.Inference.BayesModelSelection import * +from UQpy.Inference.InferenceModel import * +from UQpy.Inference.InfoModelSelection import * +from UQpy.Inference.BayesParameterEstimation import * +from UQpy.Inference.MLEstimation import * diff --git a/src/UQpy/Reliability/SubsetSimulation.py b/src/UQpy/Reliability/SubsetSimulation.py index 233085268..e00f0b259 100644 --- a/src/UQpy/Reliability/SubsetSimulation.py +++ b/src/UQpy/Reliability/SubsetSimulation.py @@ -1,10 +1,11 @@ -import numpy as np -from ..Distributions import * -from .. RunModel import RunModel -from .. SampleMethods import * import warnings from inspect import isclass +import numpy as np + +from UQpy.RunModel import RunModel +from UQpy.SampleMethods import * + ######################################################################################################################## ######################################################################################################################## diff --git a/src/UQpy/Reliability/TaylorSeries/FORM.py b/src/UQpy/Reliability/TaylorSeries/FORM.py index e2b2ef408..15e9987d7 100644 --- a/src/UQpy/Reliability/TaylorSeries/FORM.py +++ b/src/UQpy/Reliability/TaylorSeries/FORM.py @@ -1,10 +1,10 @@ import numpy as np -from UQpy.Distributions import * -from UQpy.RunModel import RunModel -from .TaylorSeries import TaylorSeries -from UQpy.Transformations import * import scipy.stats as stats +from UQpy.Transformations import * +from UQpy.Reliability.TaylorSeries.TaylorSeries import TaylorSeries + + ######################################################################################################################## ######################################################################################################################## # First order reliability method diff --git a/src/UQpy/Reliability/TaylorSeries/SORM.py b/src/UQpy/Reliability/TaylorSeries/SORM.py index cadf039f5..3de75c9da 100644 --- a/src/UQpy/Reliability/TaylorSeries/SORM.py +++ b/src/UQpy/Reliability/TaylorSeries/SORM.py @@ -1,11 +1,10 @@ import numpy as np -from UQpy.Distributions import * -from UQpy.RunModel import RunModel -from .TaylorSeries import TaylorSeries -from .FORM import FORM -from UQpy.Transformations import * import scipy.stats as stats +from UQpy.Reliability.TaylorSeries.FORM import FORM +from UQpy.Reliability.TaylorSeries.TaylorSeries import TaylorSeries + + ######################################################################################################################## ######################################################################################################################## # Second order reliability method diff --git a/src/UQpy/Reliability/TaylorSeries/TaylorSeries.py b/src/UQpy/Reliability/TaylorSeries/TaylorSeries.py index 17c41c286..432a85b45 100644 --- a/src/UQpy/Reliability/TaylorSeries/TaylorSeries.py +++ b/src/UQpy/Reliability/TaylorSeries/TaylorSeries.py @@ -1,7 +1,7 @@ import numpy as np from UQpy.Distributions import * from UQpy.RunModel import RunModel -from UQpy.Transformations import * +from UQpy.Transformations import * ######################################################################################################################## ######################################################################################################################## diff --git a/src/UQpy/Reliability/TaylorSeries/__init__.py b/src/UQpy/Reliability/TaylorSeries/__init__.py index 62f1b88a1..a8abc14da 100644 --- a/src/UQpy/Reliability/TaylorSeries/__init__.py +++ b/src/UQpy/Reliability/TaylorSeries/__init__.py @@ -1,4 +1,4 @@ -from .FORM import FORM -from .SORM import SORM -from .TaylorSeries import TaylorSeries +from UQpy.Reliability.TaylorSeries.FORM import FORM +from UQpy.Reliability.TaylorSeries.SORM import SORM +from UQpy.Reliability.TaylorSeries.TaylorSeries import TaylorSeries diff --git a/src/UQpy/Reliability/__init__.py b/src/UQpy/Reliability/__init__.py index 10164b09d..210d52744 100644 --- a/src/UQpy/Reliability/__init__.py +++ b/src/UQpy/Reliability/__init__.py @@ -25,8 +25,8 @@ """ -from .SubsetSimulation import SubsetSimulation -from . TaylorSeries import * +from UQpy.Reliability.SubsetSimulation import SubsetSimulation +from UQpy.Reliability.TaylorSeries import * from . import ( TaylorSeries diff --git a/src/UQpy/SampleMethods/AKMCS.py b/src/UQpy/SampleMethods/AKMCS.py index 7d9decaa4..38a109977 100644 --- a/src/UQpy/SampleMethods/AKMCS.py +++ b/src/UQpy/SampleMethods/AKMCS.py @@ -1,7 +1,8 @@ -from UQpy.Distributions import * -from .LHS import LHS -import scipy.stats as stats import numpy as np +import scipy.stats as stats + +from UQpy.SampleMethods.LHS import LHS + ######################################################################################################################## # Adaptive Kriging-Monte Carlo Simulation (AK-MCS) diff --git a/src/UQpy/SampleMethods/MCMC/DRAM.py b/src/UQpy/SampleMethods/MCMC/DRAM.py index 08adb6ed5..5ad3f0dc0 100644 --- a/src/UQpy/SampleMethods/MCMC/DRAM.py +++ b/src/UQpy/SampleMethods/MCMC/DRAM.py @@ -1,4 +1,4 @@ -from .mcmc import MCMC +from UQpy.SampleMethods.MCMC.mcmc import MCMC from UQpy.Distributions import * import numpy as np diff --git a/src/UQpy/SampleMethods/MCMC/DREAM.py b/src/UQpy/SampleMethods/MCMC/DREAM.py index 242ba8b7c..a1807c63e 100644 --- a/src/UQpy/SampleMethods/MCMC/DREAM.py +++ b/src/UQpy/SampleMethods/MCMC/DREAM.py @@ -1,4 +1,4 @@ -from .mcmc import MCMC +from UQpy.SampleMethods.MCMC.mcmc import MCMC from UQpy.Distributions import * import numpy as np diff --git a/src/UQpy/SampleMethods/MCMC/MH.py b/src/UQpy/SampleMethods/MCMC/MH.py index 94d0fc1e6..91607e8d3 100644 --- a/src/UQpy/SampleMethods/MCMC/MH.py +++ b/src/UQpy/SampleMethods/MCMC/MH.py @@ -1,4 +1,4 @@ -from .mcmc import MCMC +from UQpy.SampleMethods.MCMC.mcmc import MCMC from UQpy.Distributions import * import numpy as np diff --git a/src/UQpy/SampleMethods/MCMC/MMH.py b/src/UQpy/SampleMethods/MCMC/MMH.py index 1aee5907b..08dbb1f1e 100644 --- a/src/UQpy/SampleMethods/MCMC/MMH.py +++ b/src/UQpy/SampleMethods/MCMC/MMH.py @@ -1,4 +1,4 @@ -from .mcmc import MCMC +from UQpy.SampleMethods.MCMC.mcmc import MCMC from UQpy.Distributions import * import numpy as np diff --git a/src/UQpy/SampleMethods/MCMC/Stretch.py b/src/UQpy/SampleMethods/MCMC/Stretch.py index f6cc1c7e3..c7c34d54a 100644 --- a/src/UQpy/SampleMethods/MCMC/Stretch.py +++ b/src/UQpy/SampleMethods/MCMC/Stretch.py @@ -1,4 +1,4 @@ -from .mcmc import MCMC +from UQpy.SampleMethods.MCMC.mcmc import MCMC from UQpy.Distributions import * import numpy as np diff --git a/src/UQpy/SampleMethods/MCMC/__init__.py b/src/UQpy/SampleMethods/MCMC/__init__.py index d72d61ba2..9424a2b87 100644 --- a/src/UQpy/SampleMethods/MCMC/__init__.py +++ b/src/UQpy/SampleMethods/MCMC/__init__.py @@ -1,9 +1,9 @@ -from .MH import MH -from .MMH import MMH -from .Stretch import Stretch -from .DRAM import DRAM -from .DREAM import DREAM -from .mcmc import MCMC +from UQpy.SampleMethods.MCMC.MH import MH +from UQpy.SampleMethods.MCMC.MMH import MMH +from UQpy.SampleMethods.MCMC.Stretch import Stretch +from UQpy.SampleMethods.MCMC.DRAM import DRAM +from UQpy.SampleMethods.MCMC.DREAM import DREAM +from UQpy.SampleMethods.MCMC.mcmc import MCMC diff --git a/src/UQpy/SampleMethods/RSS/__init__.py b/src/UQpy/SampleMethods/RSS/__init__.py index 2aa37a06e..7312cf822 100644 --- a/src/UQpy/SampleMethods/RSS/__init__.py +++ b/src/UQpy/SampleMethods/RSS/__init__.py @@ -1,4 +1,4 @@ -from .rectangular import RectangularRSS -from .voronoi import VoronoiRSS -from .rss import RSS +from UQpy.SampleMethods.RSS.rectangular import RectangularRSS +from UQpy.SampleMethods.RSS.voronoi import VoronoiRSS +from UQpy.SampleMethods.RSS.rss import RSS diff --git a/src/UQpy/SampleMethods/RSS/rectangular.py b/src/UQpy/SampleMethods/RSS/rectangular.py index bd950d1c6..85a74d855 100644 --- a/src/UQpy/SampleMethods/RSS/rectangular.py +++ b/src/UQpy/SampleMethods/RSS/rectangular.py @@ -1,5 +1,5 @@ -from .rss import RSS -from ..STS import RectangularSTS +from UQpy.SampleMethods.RSS.rss import RSS +from UQpy.SampleMethods.STS import RectangularSTS import numpy as np import scipy.stats as stats import copy diff --git a/src/UQpy/SampleMethods/RSS/rss.py b/src/UQpy/SampleMethods/RSS/rss.py index 5a8cf02fd..df0982dff 100644 --- a/src/UQpy/SampleMethods/RSS/rss.py +++ b/src/UQpy/SampleMethods/RSS/rss.py @@ -1,5 +1,5 @@ import numpy as np -from ...Utilities import gradient +from UQpy.Utilities import gradient class RSS: """ diff --git a/src/UQpy/SampleMethods/RSS/voronoi.py b/src/UQpy/SampleMethods/RSS/voronoi.py index c5a02a27d..84fd65a99 100644 --- a/src/UQpy/SampleMethods/RSS/voronoi.py +++ b/src/UQpy/SampleMethods/RSS/voronoi.py @@ -1,8 +1,9 @@ -from .rss import RSS -import scipy.stats as stats import numpy as np -from ..Strata import VoronoiStrata, DelaunayStrata -from ..Simplex import Simplex + +from UQpy.SampleMethods.RSS.rss import RSS +from UQpy.SampleMethods.Simplex import Simplex +from UQpy.SampleMethods.Strata import VoronoiStrata, DelaunayStrata + class VoronoiRSS(RSS): """ diff --git a/src/UQpy/SampleMethods/STS/__init__.py b/src/UQpy/SampleMethods/STS/__init__.py index a675e4e74..dadd6e753 100644 --- a/src/UQpy/SampleMethods/STS/__init__.py +++ b/src/UQpy/SampleMethods/STS/__init__.py @@ -1,4 +1,4 @@ -from .delaunay import DelaunaySTS -from .rectangular import RectangularSTS -from .voronoi import VoronoiSTS -from .sts import STS +from UQpy.SampleMethods.STS.delaunay import DelaunaySTS +from UQpy.SampleMethods.STS.rectangular import RectangularSTS +from UQpy.SampleMethods.STS.voronoi import VoronoiSTS +from UQpy.SampleMethods.STS.sts import STS diff --git a/src/UQpy/SampleMethods/STS/delaunay.py b/src/UQpy/SampleMethods/STS/delaunay.py index 63928843f..1697260c3 100644 --- a/src/UQpy/SampleMethods/STS/delaunay.py +++ b/src/UQpy/SampleMethods/STS/delaunay.py @@ -1,8 +1,9 @@ -from .sts import STS -import scipy.stats as stats import numpy as np -from ..Strata import DelaunayStrata -from ..Simplex import Simplex + +from UQpy.SampleMethods.STS.sts import STS +from UQpy.SampleMethods.Simplex import Simplex +from UQpy.SampleMethods.Strata import DelaunayStrata + class DelaunaySTS(STS): """ diff --git a/src/UQpy/SampleMethods/STS/rectangular.py b/src/UQpy/SampleMethods/STS/rectangular.py index bd54e5dcb..950ba2edf 100644 --- a/src/UQpy/SampleMethods/STS/rectangular.py +++ b/src/UQpy/SampleMethods/STS/rectangular.py @@ -1,5 +1,5 @@ -from .sts import STS -from ..Strata import RectangularStrata +from UQpy.SampleMethods.STS.sts import STS +from UQpy.SampleMethods.Strata import RectangularStrata import numpy as np import scipy.stats as stats diff --git a/src/UQpy/SampleMethods/STS/voronoi.py b/src/UQpy/SampleMethods/STS/voronoi.py index c0302c3b6..fc930566f 100644 --- a/src/UQpy/SampleMethods/STS/voronoi.py +++ b/src/UQpy/SampleMethods/STS/voronoi.py @@ -1,8 +1,8 @@ -from .sts import STS -import scipy.stats as stats import numpy as np -from ..Strata import VoronoiStrata -from ..Simplex import Simplex + +from UQpy.SampleMethods.STS.sts import STS +from UQpy.SampleMethods.Simplex import Simplex +from UQpy.SampleMethods.Strata import VoronoiStrata class VoronoiSTS(STS): diff --git a/src/UQpy/SampleMethods/Simplex.py b/src/UQpy/SampleMethods/Simplex.py index bbf0394fb..0cf9a7dee 100644 --- a/src/UQpy/SampleMethods/Simplex.py +++ b/src/UQpy/SampleMethods/Simplex.py @@ -1,4 +1,3 @@ -from UQpy.Distributions import * import numpy as np import scipy.stats as stats diff --git a/src/UQpy/SampleMethods/Strata/__init__.py b/src/UQpy/SampleMethods/Strata/__init__.py index d62639e86..689889b1d 100644 --- a/src/UQpy/SampleMethods/Strata/__init__.py +++ b/src/UQpy/SampleMethods/Strata/__init__.py @@ -1,6 +1,6 @@ -from .delaunay import DelaunayStrata -from .rectangular import RectangularStrata -from .voronoi import VoronoiStrata -from .strata import Strata +from UQpy.SampleMethods.Strata.delaunay import DelaunayStrata +from UQpy.SampleMethods.Strata.rectangular import RectangularStrata +from UQpy.SampleMethods.Strata.voronoi import VoronoiStrata +from UQpy.SampleMethods.Strata.strata import Strata diff --git a/src/UQpy/SampleMethods/Strata/delaunay.py b/src/UQpy/SampleMethods/Strata/delaunay.py index fd12bbc0f..ee4b8c326 100644 --- a/src/UQpy/SampleMethods/Strata/delaunay.py +++ b/src/UQpy/SampleMethods/Strata/delaunay.py @@ -1,8 +1,9 @@ -from .strata import Strata -from UQpy.Distributions import * import numpy as np import scipy.stats as stats +from UQpy.SampleMethods.Strata.strata import Strata + + class DelaunayStrata(Strata): """ Define a geometric decomposition of the n-dimensional unit hypercube into disjoint and space-filling diff --git a/src/UQpy/SampleMethods/Strata/rectangular.py b/src/UQpy/SampleMethods/Strata/rectangular.py index 6ad1c0301..4899759c9 100644 --- a/src/UQpy/SampleMethods/Strata/rectangular.py +++ b/src/UQpy/SampleMethods/Strata/rectangular.py @@ -1,7 +1,8 @@ -from .strata import Strata -from UQpy.Distributions import * import numpy as np +from UQpy.SampleMethods.Strata.strata import Strata + + class RectangularStrata(Strata): """ Define a geometric decomposition of the n-dimensional unit hypercube into disjoint and space-filling diff --git a/src/UQpy/SampleMethods/Strata/strata.py b/src/UQpy/SampleMethods/Strata/strata.py index fd9c27061..4dcbb9269 100644 --- a/src/UQpy/SampleMethods/Strata/strata.py +++ b/src/UQpy/SampleMethods/Strata/strata.py @@ -1,5 +1,5 @@ import numpy as np -import scipy.stats as stats + class Strata: """ diff --git a/src/UQpy/SampleMethods/Strata/voronoi.py b/src/UQpy/SampleMethods/Strata/voronoi.py index 035cddfa8..a728e7341 100644 --- a/src/UQpy/SampleMethods/Strata/voronoi.py +++ b/src/UQpy/SampleMethods/Strata/voronoi.py @@ -1,8 +1,9 @@ -from .strata import Strata -from UQpy.Distributions import * import numpy as np import scipy.stats as stats +from UQpy.SampleMethods.Strata.strata import Strata + + class VoronoiStrata(Strata): """ Define a geometric decomposition of the n-dimensional unit hypercube into disjoint and space-filling diff --git a/src/UQpy/SampleMethods/__init__.py b/src/UQpy/SampleMethods/__init__.py index cd3d3e035..6b47d02ab 100644 --- a/src/UQpy/SampleMethods/__init__.py +++ b/src/UQpy/SampleMethods/__init__.py @@ -32,16 +32,16 @@ """ -from .MCS import MCS -from .LHS import LHS -from .IS import IS -from .AKMCS import AKMCS -from .Simplex import Simplex - -from .RSS import * -from .STS import * -from .MCMC import * -from .Strata import * +from UQpy.SampleMethods.MCS import MCS +from UQpy.SampleMethods.LHS import LHS +from UQpy.SampleMethods.IS import IS +from UQpy.SampleMethods.AKMCS import AKMCS +from UQpy.SampleMethods.Simplex import Simplex + +from UQpy.SampleMethods.RSS import * +from UQpy.SampleMethods.STS import * +from UQpy.SampleMethods.MCMC import * +from UQpy.SampleMethods.Strata import * from . import ( MCMC, RSS, STS, Strata diff --git a/src/UQpy/Sensitivity/__init__.py b/src/UQpy/Sensitivity/__init__.py index 1c11f6fae..0f99b0463 100644 --- a/src/UQpy/Sensitivity/__init__.py +++ b/src/UQpy/Sensitivity/__init__.py @@ -25,10 +25,9 @@ """ -from .Morris import Morris - -from .Morris import * +from UQpy.Sensitivity.Morris import Morris +from UQpy.Sensitivity.Morris import * from . import ( Morris diff --git a/src/UQpy/StochasticProcess/BSRM.py b/src/UQpy/StochasticProcess/BSRM.py index 45a2469e3..e28168e0e 100644 --- a/src/UQpy/StochasticProcess/BSRM.py +++ b/src/UQpy/StochasticProcess/BSRM.py @@ -1,9 +1,7 @@ -import numpy as np -from UQpy.Distributions import * import itertools -from scipy.linalg import sqrtm + from UQpy.Utilities import * -from .supportive import inverse_wiener_khinchin_transform, wiener_khinchin_transform, scaling_correlation_function + ######################################################################################################################## ######################################################################################################################## diff --git a/src/UQpy/StochasticProcess/InverseTranslation.py b/src/UQpy/StochasticProcess/InverseTranslation.py index e8137ebee..3cdd48880 100644 --- a/src/UQpy/StochasticProcess/InverseTranslation.py +++ b/src/UQpy/StochasticProcess/InverseTranslation.py @@ -1,9 +1,6 @@ -import numpy as np from UQpy.Distributions import * -import itertools -from scipy.linalg import sqrtm from UQpy.Utilities import * -from .supportive import inverse_wiener_khinchin_transform, wiener_khinchin_transform, scaling_correlation_function +from UQpy.StochasticProcess.supportive import inverse_wiener_khinchin_transform, wiener_khinchin_transform ######################################################################################################################## diff --git a/src/UQpy/StochasticProcess/KLE.py b/src/UQpy/StochasticProcess/KLE.py index 48c518bb4..54626b10c 100644 --- a/src/UQpy/StochasticProcess/KLE.py +++ b/src/UQpy/StochasticProcess/KLE.py @@ -1,9 +1,7 @@ -import numpy as np -from UQpy.Distributions import * -import itertools from scipy.linalg import sqrtm + from UQpy.Utilities import * -from .supportive import inverse_wiener_khinchin_transform, wiener_khinchin_transform, scaling_correlation_function + ######################################################################################################################## ######################################################################################################################## diff --git a/src/UQpy/StochasticProcess/SRM.py b/src/UQpy/StochasticProcess/SRM.py index 539b4feb1..1974cb92d 100644 --- a/src/UQpy/StochasticProcess/SRM.py +++ b/src/UQpy/StochasticProcess/SRM.py @@ -1,9 +1,4 @@ -import numpy as np -from UQpy.Distributions import * -import itertools -from scipy.linalg import sqrtm from UQpy.Utilities import * -from .supportive import inverse_wiener_khinchin_transform, wiener_khinchin_transform, scaling_correlation_function ######################################################################################################################## diff --git a/src/UQpy/StochasticProcess/Translation.py b/src/UQpy/StochasticProcess/Translation.py index 42a52ebac..e91bcd206 100644 --- a/src/UQpy/StochasticProcess/Translation.py +++ b/src/UQpy/StochasticProcess/Translation.py @@ -1,11 +1,12 @@ -import numpy as np -from UQpy.Distributions import * import itertools -from scipy.linalg import sqrtm -from UQpy.Utilities import * -from .supportive import inverse_wiener_khinchin_transform, wiener_khinchin_transform, scaling_correlation_function + from scipy.stats import norm +from UQpy.Utilities import * +from UQpy.StochasticProcess.supportive import inverse_wiener_khinchin_transform, wiener_khinchin_transform, \ + scaling_correlation_function + + ######################################################################################################################## ######################################################################################################################## # Translation method diff --git a/src/UQpy/StochasticProcess/__init__.py b/src/UQpy/StochasticProcess/__init__.py index 034eb613c..60074c406 100644 --- a/src/UQpy/StochasticProcess/__init__.py +++ b/src/UQpy/StochasticProcess/__init__.py @@ -32,11 +32,11 @@ """ -from .SRM import SRM -from .BSRM import BSRM -from .KLE import KLE -from .Translation import Translation -from .InverseTranslation import InverseTranslation +from UQpy.StochasticProcess.SRM import SRM +from UQpy.StochasticProcess.BSRM import BSRM +from UQpy.StochasticProcess.KLE import KLE +from UQpy.StochasticProcess.Translation import Translation +from UQpy.StochasticProcess.InverseTranslation import InverseTranslation from .supportive import * diff --git a/src/UQpy/StochasticProcess/supportive/__init__.py b/src/UQpy/StochasticProcess/supportive/__init__.py index f6350caa2..aa038448a 100644 --- a/src/UQpy/StochasticProcess/supportive/__init__.py +++ b/src/UQpy/StochasticProcess/supportive/__init__.py @@ -1,5 +1,5 @@ """Collection of baseclasses""" -from .inverse_wiener_khinchin_transform import inverse_wiener_khinchin_transform -from .wiener_khinchin_transform import wiener_khinchin_transform -from .scaling_correlation_function import scaling_correlation_function +from UQpy.StochasticProcess.supportive.inverse_wiener_khinchin_transform import inverse_wiener_khinchin_transform +from UQpy.StochasticProcess.supportive.wiener_khinchin_transform import wiener_khinchin_transform +from UQpy.StochasticProcess.supportive.scaling_correlation_function import scaling_correlation_function diff --git a/src/UQpy/Surrogates/Kriging/Kriging.py b/src/UQpy/Surrogates/Kriging/Kriging.py index 08a6f807c..c3836adc6 100755 --- a/src/UQpy/Surrogates/Kriging/Kriging.py +++ b/src/UQpy/Surrogates/Kriging/Kriging.py @@ -28,13 +28,13 @@ import numpy as np import scipy.stats as stats -from UQpy.Distributions import Normal, Uniform, Lognormal, Rayleigh, JointInd +from UQpy.Distributions import Normal, Uniform, DistributionContinuous1D, JointInd import scipy.integrate as integrate import scipy.special as special import itertools, math import warnings + warnings.filterwarnings("ignore") -from UQpy.Distributions import DistributionContinuous1D ######################################################################################################################## @@ -45,7 +45,6 @@ class SROM: - """ Stochastic Reduced Order Model(SROM) provide a low-dimensional, discrete approximation of a given random quantity. @@ -284,7 +283,7 @@ def constraint(x): args=(self.samples, self.weights_distribution, self.weights_moments, self.weights_correlation, self.target_dist_object, self.nsamples, self.dimension, self.moments, self.weights_errors, self.properties, self.correlation), - constraints=cons, method='SLSQP', bounds=[[0, 1]]*self.nsamples) + constraints=cons, method='SLSQP', bounds=[[0, 1]] * self.nsamples) self.sample_weights = p_.x if self.verbose: @@ -475,7 +474,7 @@ def __init__(self, reg_model='Linear', corr_model='Exponential', bounds=None, op raise NotImplementedError("UQpy: corr_model_params is not defined.") if self.bounds is None: - self.bounds = [[0.001, 10**7]]*self.corr_model_params.shape[0] + self.bounds = [[0.001, 10 ** 7]] * self.corr_model_params.shape[0] if self.optimizer is None: from scipy.optimize import fmin_l_bfgs_b @@ -543,7 +542,7 @@ def log_likelihood(p0, cm, s, f, y): n = s.shape[1] r__, dr_ = cm(x=s, s=s, params=p0, dt=True) try: - cc = cholesky(r__ + 2**(-52) * np.eye(m), lower=True) + cc = cholesky(r__ + 2 ** (-52) * np.eye(m), lower=True) except np.linalg.LinAlgError: return np.inf, np.zeros(n) @@ -572,7 +571,7 @@ def log_likelihood(p0, cm, s, f, y): for out_dim in range(y.shape[1]): sigma_[out_dim] = (1 / m) * (np.linalg.norm(y__[:, out_dim] - np.matmul(f__, beta_[:, out_dim])) ** 2) # Objective function:= log(det(sigma**2 * R)) + constant - ll = ll + (np.log(np.linalg.det(sigma_[out_dim] * r__)) + m * (np.log(2 * np.pi) + 1))/2 + ll = ll + (np.log(np.linalg.det(sigma_[out_dim] * r__)) + m * (np.log(2 * np.pi) + 1)) / 2 # Gradient of loglikelihood # Reference: C. E. Rasmussen & C. K. I. Williams, Gaussian Processes for Machine Learning, the MIT Press, @@ -607,8 +606,8 @@ def log_likelihood(p0, cm, s, f, y): if self.normalize: self.sample_mean, self.sample_std = np.mean(self.samples, 0), np.std(self.samples, 0) self.value_mean, self.value_std = np.mean(self.values, 0), np.std(self.values, 0) - s_ = (self.samples - self.sample_mean)/self.sample_std - y_ = (self.values - self.value_mean)/self.value_std + s_ = (self.samples - self.sample_mean) / self.sample_std + y_ = (self.values - self.value_mean) / self.value_std else: s_ = self.samples y_ = self.values @@ -637,11 +636,11 @@ def log_likelihood(p0, cm, s, f, y): # Updated Correlation matrix corresponding to MLE estimates of hyperparameters self.R = self.corr_model(x=s_, s=s_, params=self.corr_model_params) # Compute the regression coefficient (solving this linear equation: F * beta = Y) - c = np.linalg.cholesky(self.R) # Eq: 3.8, DACE + c = np.linalg.cholesky(self.R) # Eq: 3.8, DACE c_inv = np.linalg.inv(c) f_dash = np.linalg.solve(c, self.F) y_dash = np.linalg.solve(c, y_) - q_, g_ = np.linalg.qr(f_dash) # Eq: 3.11, DACE + q_, g_ = np.linalg.qr(f_dash) # Eq: 3.11, DACE # Check if F is a full rank matrix if np.linalg.matrix_rank(g_) != min(np.size(self.F, 0), np.size(self.F, 1)): raise NotImplementedError("Chosen regression functions are not sufficiently linearly independent") @@ -687,7 +686,7 @@ def predict(self, x, return_std=False): """ x_ = np.atleast_2d(x) if self.normalize: - x_ = (x_ - self.sample_mean)/self.sample_std + x_ = (x_ - self.sample_mean) / self.sample_std s_ = (self.samples - self.sample_mean) / self.sample_std else: s_ = self.samples @@ -741,7 +740,7 @@ def jacobian(self, x): rx, drdx = self.corr_model(x=x_, s=s_, params=self.corr_model_params, dx=True) y_grad = np.einsum('ikj,jm->ik', jf, self.beta) + np.einsum('ijk,jm->ki', drdx.T, self.gamma) if self.normalize: - y_grad = y_grad * self.value_std/self.sample_std + y_grad = y_grad * self.value_std / self.sample_std if x_.shape[1] == 1: y_grad = y_grad.flatten() return y_grad diff --git a/src/UQpy/Surrogates/Kriging/__init__.py b/src/UQpy/Surrogates/Kriging/__init__.py index 6aadda021..2cdf7bd2d 100644 --- a/src/UQpy/Surrogates/Kriging/__init__.py +++ b/src/UQpy/Surrogates/Kriging/__init__.py @@ -1,2 +1,2 @@ -from .Kriging import Kriging +from UQpy.Surrogates.Kriging.Kriging import Kriging diff --git a/src/UQpy/Surrogates/__init__.py b/src/UQpy/Surrogates/__init__.py index 7d90bb736..721979d32 100644 --- a/src/UQpy/Surrogates/__init__.py +++ b/src/UQpy/Surrogates/__init__.py @@ -28,9 +28,9 @@ """ -from .PCE import * -from .SROM import * -from .Kriging import * +from UQpy.Surrogates.pce import * +from UQpy.Surrogates.SROM import * +from UQpy.Surrogates.Kriging import * from . import ( PCE, SROM, Kriging diff --git a/src/UQpy/Surrogates/pce/PCE.py b/src/UQpy/Surrogates/pce/PCE.py index 768e51a11..4ba44cdfd 100644 --- a/src/UQpy/Surrogates/pce/PCE.py +++ b/src/UQpy/Surrogates/pce/PCE.py @@ -1,7 +1,7 @@ -import numpy as np -from .PolyChaosLstsq import PolyChaosLstsq -from .PolyChaosRidge import PolyChaosRidge -from .PolyChaosLasso import PolyChaosLasso +from UQpy.Surrogates.pce.PolyChaosLstsq import PolyChaosLstsq +from UQpy.Surrogates.pce.PolyChaosRidge import PolyChaosRidge +from UQpy.Surrogates.pce.PolyChaosLasso import PolyChaosLasso + class PCE: """ diff --git a/src/UQpy/Surrogates/pce/Polynomials.py b/src/UQpy/Surrogates/pce/Polynomials.py index c5663b24f..48eb8d23a 100644 --- a/src/UQpy/Surrogates/pce/Polynomials.py +++ b/src/UQpy/Surrogates/pce/Polynomials.py @@ -1,15 +1,11 @@ +import itertools +import math + import numpy as np -<<<<<<< HEAD:src/UQpy/Surrogates/pce/Polynomials.py import scipy.integrate as integrate -import math -import itertools -from ...Distributions import * -======= + from UQpy.Distributions import * -import scipy.special as special -import scipy.integrate as integrate -import itertools, math ->>>>>>> aaf8eb8809fee22dddeffcf235d90b8beea780ad:src/UQpy/Surrogates/baseclass/Polynomials.py + class Polynomials: """ @@ -232,107 +228,3 @@ def evaluate(self, x): design[:, i] *= h return design - - -class Hermite(Polynomials): - """ - Class of univariate polynomials appropriate for data generated from a - normal distribution. - - **Inputs:** - - * **degree** ('int'): - Maximum degree of the polynomials. - - * **dist_object** ('class'): - Distribution object of the generated samples. - - **Methods:** - """ - - def __init__(self, degree, dist_object): - super().__init__(dist_object, degree) - self.degree = degree - self.pdf = self.dist_object.pdf - - def get_polys(self, x): - """ - Calculates the normalized Hermite polynomials evaluated at sample points. - - **Inputs:** - - * **x** (`ndarray`): - `ndarray` containing the samples. - - **Outputs:** - - (`list`): - Returns a list of 'ndarrays' with the design matrix and the - normalized polynomials. - """ - a, b = -np.inf, np.inf - mean_ = Polynomials.get_mean(self) - std_ = Polynomials.get_std(self) - x_ = Polynomials.standardize_normal(x, mean_, std_) - - norm = Normal(0, 1) - pdf_st = norm.pdf - - p = [] - for i in range(self.degree): - p.append(special.hermitenorm(i, monic=False)) - - return Polynomials.normalized(self.degree, x_, a, b, pdf_st, p) - -""" - Class of univariate polynomials appropriate for data generated from a - uniform distribution. - - **Inputs:** - - * **degree** ('int'): - Maximum degree of the polynomials. - - * **dist_object** ('class'): - Distribution object of the generated samples. - - **Methods:** - """ -class Legendre(Polynomials): - - def __init__(self, degree, dist_object): - super().__init__(dist_object, degree) - self.degree = degree - self.pdf = self.dist_object.pdf - - def get_polys(self, x): - """ - Calculates the normalized Legendre polynomials evaluated at sample points. - - **Inputs:** - - * **x** (`ndarray`): - `ndarray` containing the samples. - - * **y** (`ndarray`): - `ndarray` containing the samples. - - **Outputs:** - - (`list`): - Returns a list of 'ndarrays' with the design matrix and the - normalized polynomials. - - """ - a, b = -1, 1 - m, scale = Polynomials.get_mean(self), Polynomials.scale(self) - x_ = Polynomials.standardize_uniform(x, m, scale) - - uni = Uniform(a, b - a) - pdf_st = uni.pdf - - p = [] - for i in range(self.degree): - p.append(special.legendre(i, monic=False)) - - return Polynomials.normalized(self.degree, x_, a, b, pdf_st, p) \ No newline at end of file diff --git a/src/UQpy/Surrogates/pce/__init__.py b/src/UQpy/Surrogates/pce/__init__.py index 1a03d38de..a8af1f0a1 100644 --- a/src/UQpy/Surrogates/pce/__init__.py +++ b/src/UQpy/Surrogates/pce/__init__.py @@ -1,19 +1,9 @@ -<<<<<<< HEAD -from .ErrorEstimation import ErrorEstimation -from .MomentEstimation import MomentEstimation -from .PCE import PCE -from .Polynomials import Polynomials -from .PolyChaosLasso import PolyChaosLasso -from .PolyChaosLstsq import PolyChaosLstsq -from .PolyChaosRidge import PolyChaosRidge -from . polynomials import * -======= from UQpy.Surrogates.pce.ErrorEstimation import ErrorEstimation from UQpy.Surrogates.pce.MomentEstimation import MomentEstimation from UQpy.Surrogates.pce.PCE import PCE +from UQpy.Surrogates.pce.Polynomials import Polynomials from UQpy.Surrogates.pce.PolyChaosLasso import PolyChaosLasso from UQpy.Surrogates.pce.PolyChaosLstsq import PolyChaosLstsq from UQpy.Surrogates.pce.PolyChaosRidge import PolyChaosRidge - ->>>>>>> aaf8eb8809fee22dddeffcf235d90b8beea780ad +from UQpy.Surrogates.pce.polynomials import * diff --git a/src/UQpy/Surrogates/pce/polynomials/Hermite.py b/src/UQpy/Surrogates/pce/polynomials/Hermite.py index 5c56a6904..a7013323d 100644 --- a/src/UQpy/Surrogates/pce/polynomials/Hermite.py +++ b/src/UQpy/Surrogates/pce/polynomials/Hermite.py @@ -1,6 +1,6 @@ -from ..Polynomials import Polynomials +from UQpy.Surrogates.pce.Polynomials import Polynomials import numpy as np -from ....Distributions import Normal +from UQpy.Distributions import Normal import scipy.special as special class Hermite(Polynomials): diff --git a/src/UQpy/Surrogates/pce/polynomials/Legendre.py b/src/UQpy/Surrogates/pce/polynomials/Legendre.py index ff15d21ad..b0f78b007 100644 --- a/src/UQpy/Surrogates/pce/polynomials/Legendre.py +++ b/src/UQpy/Surrogates/pce/polynomials/Legendre.py @@ -1,8 +1,9 @@ -from ..Polynomials import Polynomials -import numpy as np -from UQpy.Distributions import Uniform import scipy.special as special +from UQpy.Distributions import Uniform +from UQpy.Surrogates.pce.Polynomials import Polynomials + + class Legendre(Polynomials): """ Class of univariate polynomials appropriate for data generated from a diff --git a/src/UQpy/Surrogates/pce/polynomials/__init__.py b/src/UQpy/Surrogates/pce/polynomials/__init__.py index fcba4f8ea..728c80921 100644 --- a/src/UQpy/Surrogates/pce/polynomials/__init__.py +++ b/src/UQpy/Surrogates/pce/polynomials/__init__.py @@ -1,2 +1,2 @@ -from .Hermite import Hermite -from .Legendre import Legendre +from UQpy.Surrogates.pce.polynomials.Hermite import Hermite +from UQpy.Surrogates.pce.polynomials.Legendre import Legendre diff --git a/src/UQpy/Utilities.py b/src/UQpy/Utilities.py index 121c5546e..2920bdb7e 100755 --- a/src/UQpy/Utilities.py +++ b/src/UQpy/Utilities.py @@ -18,7 +18,7 @@ import numpy as np import scipy.stats as stats -from . RunModel import RunModel +from UQpy.RunModel import RunModel def svd(matrix, rank=None, tol=None): diff --git a/tests/test_PCE.py b/tests/test_PCE.py index a2b895369..2621c01f5 100644 --- a/tests/test_PCE.py +++ b/tests/test_PCE.py @@ -1,9 +1,7 @@ import sys sys.path.append('../../src/UQpy/') from UQpy.Distributions import Uniform -import UQpy.Surrogates from UQpy.Surrogates import * -from UQpy.Surrogates.baseclass.Polynomials import Legendre import numpy as np np.random.seed(1)