Fix PCE cyclic reference & changes in folder structure

example/StochasticProcess/BSRM_1d.ipynb

@@ -231,7 +231,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.4"
+   "version": "3.8.5"
   }
  },
  "nbformat": 4,

example/Surrogates/PCE/PCE_Example4.ipynb

@@ -57,6 +57,7 @@
    "source": [
     "import numpy as np\n",
     "import matplotlib.pyplot as plt\n",
+    "from UQpy.Distributions import Uniform, JointInd\n",
     "from UQpy.Surrogates import *"
    ]
   },
@@ -180,7 +181,7 @@
      "output_type": "stream",
      "text": [
       "Error from least squares regression is:  9.25e-05\n",
-      "Error from LASSO is:  0.002566\n",
+      "Error from LASSO is:  0.0024183\n",
       "Error from Ridge is:  0.0026148\n"
      ]
     }
@@ -221,9 +222,9 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Moments from least squares regression : (8.247977, 45.397944)\n",
-      "Moments from LASSO regression : (8.178689, 44.778469)\n",
-      "Moments from Ridge regression : (8.176812, 44.721672)\n",
+      "Moments from least squares regression : (8.248, 45.3979)\n",
+      "Moments from LASSO regression : (8.1807, 44.7966)\n",
+      "Moments from Ridge regression : (8.1768, 44.7217)\n",
       "Moments from MC integration:  (8.25404, 45.383791)\n"
      ]
     }
@@ -264,7 +265,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.7"
+   "version": "3.8.5"
   }
  },
  "nbformat": 4,

example/Surrogates/PCE/PCE_Example5.ipynb

@@ -57,6 +57,7 @@
    "source": [
     "import numpy as np\n",
     "import matplotlib.pyplot as plt\n",
+    "from UQpy.Distributions import Uniform, JointInd\n",
     "from UQpy.Surrogates import *"
    ]
   },
@@ -197,7 +198,7 @@
      "output_type": "stream",
      "text": [
       "Error from least squares regression is:  0.0035946\n",
-      "Error from LASSO is:  0.0036024\n",
+      "Error from LASSO is:  0.0034472\n",
       "Error from Ridge is:  0.0036999\n"
      ]
     }
@@ -238,9 +239,9 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Moments from least squares regression : (14.386271, 23.806292)\n",
-      "Moments from LASSO regression : (14.384072, 23.770833)\n",
-      "Moments from Ridge regression : (14.375257, 23.572673)\n",
+      "Moments from least squares regression : (14.3863, 23.8063)\n",
+      "Moments from LASSO regression : (14.3858, 23.7305)\n",
+      "Moments from Ridge regression : (14.3753, 23.5727)\n",
       "Moments from MC integration:  (14.414001, 23.852139)\n"
      ]
     }
@@ -281,7 +282,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.7"
+   "version": "3.8.5"
   }
  },
  "nbformat": 4,

example/Surrogates/PCE/PCE_Example6.ipynb

@@ -63,6 +63,7 @@
    "source": [
     "import numpy as np\n",
     "import matplotlib.pyplot as plt\n",
+    "from UQpy.Distributions import Uniform, JointInd\n",
     "from UQpy.Surrogates import *"
    ]
   },
@@ -218,7 +219,7 @@
      "output_type": "stream",
      "text": [
       "Error from least squares regression is:  0.0510225\n",
-      "Error from LASSO is:  0.0510114\n",
+      "Error from LASSO is:  0.0507776\n",
       "Error from Ridge is:  0.0503678\n"
      ]
     }
@@ -259,9 +260,9 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Moments from least squares regression : (9.984848, 92.713617)\n",
-      "Moments from LASSO regression : (9.98418, 92.683269)\n",
-      "Moments from Ridge regression : (9.959297, 91.861373)\n",
+      "Moments from least squares regression : (9.9848, 92.7136)\n",
+      "Moments from LASSO regression : (9.9842, 92.6511)\n",
+      "Moments from Ridge regression : (9.9593, 91.8614)\n",
       "Moments from MC integration:  (10.018975, 92.526962)\n"
      ]
     }
@@ -302,7 +303,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.7"
+   "version": "3.8.5"
   }
  },
  "nbformat": 4,

src/UQpy/Reliability/FORM.py → src/UQpy/Reliability/TaylorSeries/FORM.py

@@ -1,8 +1,8 @@
 import numpy as np
-from ..Distributions import *
-from .. RunModel import RunModel
-from .baseclass import TaylorSeries
-from ..Transformations import  *
+from UQpy.Distributions import *
+from UQpy.RunModel import RunModel
+from .TaylorSeries import TaylorSeries
+from UQpy.Transformations import  *
 import scipy.stats as stats
 
 ########################################################################################################################

src/UQpy/Reliability/SORM.py → src/UQpy/Reliability/TaylorSeries/SORM.py

@@ -1,9 +1,9 @@
 import numpy as np
-from ..Distributions import *
-from .. RunModel import RunModel
-from .baseclass import TaylorSeries
+from UQpy.Distributions import *
+from UQpy.RunModel import RunModel
+from .TaylorSeries import TaylorSeries
 from .FORM import FORM
-from ..Transformations import  *
+from UQpy.Transformations import  *
 import scipy.stats as stats
 
 ########################################################################################################################

src/UQpy/Reliability/baseclass/TaylorSeries.py → src/UQpy/Reliability/TaylorSeries/TaylorSeries.py

@@ -1,7 +1,7 @@
 import numpy as np
-from ...Distributions import *
-from ...RunModel import RunModel
-from ...Transformations import  *
+from UQpy.Distributions import *
+from UQpy.RunModel import RunModel
+from UQpy.Transformations import  *
 
 ########################################################################################################################
 ########################################################################################################################

src/UQpy/Reliability/TaylorSeries/__init__.py

@@ -0,0 +1,4 @@
+from .FORM import FORM
+from .SORM import SORM
+from .TaylorSeries import TaylorSeries
+

src/UQpy/Reliability/__init__.py

@@ -25,9 +25,12 @@
 
 """
 
-from .FORM import FORM
-from .SORM import SORM
 from .SubsetSimulation import SubsetSimulation
+from . TaylorSeries import *
+
+from . import (
+    TaylorSeries
+)
 
 
 

src/UQpy/SampleMethods/AKMCS.py

@@ -1,4 +1,4 @@
-from ..Distributions import *
+from UQpy.Distributions import *
 from .LHS import LHS
 import scipy.stats as stats
 import numpy as np

src/UQpy/SampleMethods/IS.py

@@ -1,4 +1,4 @@
-from ..Distributions import Distribution
+from UQpy.Distributions import Distribution
 import numpy as np
 ########################################################################################################################
 ########################################################################################################################

src/UQpy/SampleMethods/LHS.py

@@ -1,4 +1,4 @@
-from ..Distributions import *
+from UQpy.Distributions import *
 import numpy as np
 from scipy.spatial.distance import pdist
 import scipy.stats as stats

src/UQpy/SampleMethods/MCMC/DRAM.py

@@ -1,5 +1,5 @@
-from ..baseclass import MCMC
-from ...Distributions import *
+from .mcmc import MCMC
+from UQpy.Distributions import *
 import numpy as np
 
 class DRAM(MCMC):

src/UQpy/SampleMethods/MCMC/DREAM.py

@@ -1,5 +1,5 @@
-from ..baseclass import MCMC
-from ...Distributions import *
+from .mcmc import MCMC
+from UQpy.Distributions import *
 import numpy as np
 
 class DREAM(MCMC):

src/UQpy/SampleMethods/MCMC/MH.py

@@ -1,5 +1,5 @@
-from ..baseclass import MCMC
-from ...Distributions import *
+from .mcmc import MCMC
+from UQpy.Distributions import *
 import numpy as np
 
 class MH(MCMC):

src/UQpy/SampleMethods/MCMC/MMH.py

@@ -1,5 +1,5 @@
-from ..baseclass import MCMC
-from ...Distributions import *
+from .mcmc import MCMC
+from UQpy.Distributions import *
 import numpy as np
 
 class MMH(MCMC):

src/UQpy/SampleMethods/MCMC/Stretch.py

@@ -1,5 +1,5 @@
-from ..baseclass import MCMC
-from ...Distributions import *
+from .mcmc import MCMC
+from UQpy.Distributions import *
 import numpy as np
 
 class Stretch(MCMC):

src/UQpy/SampleMethods/MCMC/__init__.py

@@ -3,6 +3,7 @@
 from .Stretch import Stretch
 from .DRAM import DRAM
 from .DREAM import DREAM
+from .mcmc import MCMC
 
 
 

src/UQpy/SampleMethods/baseclass/mcmc.py → src/UQpy/SampleMethods/MCMC/mcmc.py

@@ -1,5 +1,5 @@
 import numpy as np
-from ...Distributions import Distribution
+from UQpy.Distributions import Distribution
 
 class MCMC:
     """

src/UQpy/SampleMethods/MCS.py

@@ -1,4 +1,4 @@
-from ..Distributions import *
+from UQpy.Distributions import *
 import numpy as np
 
 ########################################################################################################################

src/UQpy/SampleMethods/RSS/__init__.py

@@ -1,3 +1,4 @@
 from .rectangular import RectangularRSS
 from .voronoi import VoronoiRSS
+from .rss import RSS
 

src/UQpy/SampleMethods/RSS/rectangular.py

@@ -1,4 +1,4 @@
-from ..baseclass import RSS
+from .rss import RSS
 from ..STS import RectangularSTS
 import numpy as np
 import scipy.stats as stats

src/UQpy/SampleMethods/RSS/voronoi.py

@@ -1,4 +1,4 @@
-from ..baseclass import RSS
+from .rss import RSS
 import scipy.stats as stats
 import numpy as np
 from ..Strata import VoronoiStrata, DelaunayStrata

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

src/UQpy/SampleMethods/STS/delaunay.py

@@ -1,4 +1,4 @@
-from ..baseclass import STS
+from .sts import STS
 import scipy.stats as stats
 import numpy as np
 from ..Strata import DelaunayStrata

src/UQpy/SampleMethods/STS/rectangular.py

@@ -1,4 +1,4 @@
-from ..baseclass import STS
+from .sts import STS
 from ..Strata import RectangularStrata
 import numpy as np
 import scipy.stats as stats

src/UQpy/SampleMethods/STS/voronoi.py

@@ -1,4 +1,4 @@
-from ..baseclass import STS
+from .sts import STS
 import scipy.stats as stats
 import numpy as np
 from ..Strata import VoronoiStrata

src/UQpy/SampleMethods/Simplex.py

@@ -1,4 +1,4 @@
-from ..Distributions import *
+from UQpy.Distributions import *
 import numpy as np
 import scipy.stats as stats
 

src/UQpy/SampleMethods/Strata/__init__.py

@@ -1,5 +1,6 @@
 from .delaunay import DelaunayStrata
 from .rectangular import RectangularStrata
 from .voronoi import VoronoiStrata
+from .strata import Strata
 
 

src/UQpy/SampleMethods/Strata/delaunay.py

@@ -1,5 +1,5 @@
-from ..baseclass import Strata
-from ...Distributions import *
+from .strata import Strata
+from UQpy.Distributions import *
 import numpy as np
 import scipy.stats as stats
 

src/UQpy/SampleMethods/Strata/rectangular.py

@@ -1,5 +1,5 @@
-from ..baseclass import Strata
-from ...Distributions import *
+from .strata import Strata
+from UQpy.Distributions import *
 import numpy as np
 
 class RectangularStrata(Strata):

src/UQpy/SampleMethods/Strata/voronoi.py

@@ -1,5 +1,5 @@
-from ..baseclass import Strata
-from ...Distributions import *
+from .strata import Strata
+from UQpy.Distributions import *
 import numpy as np
 import scipy.stats as stats
 

src/UQpy/SampleMethods/__init__.py

@@ -42,8 +42,7 @@
 from .STS import *
 from .MCMC import *
 from .Strata import *
-from .baseclass import *
 
 from . import (
-    baseclass, MCMC, RSS, STS, Strata
+    MCMC, RSS, STS, Strata
 )

src/UQpy/Sensitivity/Morris.py

@@ -22,8 +22,8 @@
 - ``Morris``: Class to compute sensitivity indices based on the Morris method.
 """
 
-from ..Distributions import *
-from ..RunModel import RunModel
+from UQpy.Distributions import *
+from UQpy.RunModel import RunModel
 import numpy as np
 
 class Morris:

src/UQpy/StochasticProcess/BSRM.py

@@ -1,9 +1,9 @@
 import numpy as np
-from ..Distributions import *
+from UQpy.Distributions import *
 import itertools
 from scipy.linalg import sqrtm
-from ..Utilities import *
-from .baseclass import inverse_wiener_khinchin_transform, wiener_khinchin_transform, scaling_correlation_function
+from UQpy.Utilities import *
+from .supportive import inverse_wiener_khinchin_transform, wiener_khinchin_transform, scaling_correlation_function
 
 ########################################################################################################################
 ########################################################################################################################

src/UQpy/StochasticProcess/InverseTranslation.py

@@ -1,9 +1,9 @@
 import numpy as np
-from ..Distributions import *
+from UQpy.Distributions import *
 import itertools
 from scipy.linalg import sqrtm
-from ..Utilities import *
-from .baseclass import inverse_wiener_khinchin_transform, wiener_khinchin_transform, scaling_correlation_function
+from UQpy.Utilities import *
+from .supportive import inverse_wiener_khinchin_transform, wiener_khinchin_transform, scaling_correlation_function
 
 
 ########################################################################################################################