Merge pull request #103 from SCIInstitute/gamma-dist-fix

Affine map + sample construction

Author: akilnarayan

UncertainSCI/distributions.py

@@ -531,11 +531,11 @@ def __init__(self, k=1., theta=1., shift=0., flip=False):
         self.transform_standard_dist_to_poly = AffineTransform(A=A, b=b)
 
         if not flip:
-            A = 1/self.theta
+            A *= 1/self.theta
         else:
-            A = -1/self.theta
+            A *= -1/self.theta
 
-        b = -A*self.shift
+        b = -A @ (self.shift*np.ones(1))
         self.transform_to_standard = AffineTransform(A=A, b=b)
 
         # Construct 1D polynomial families
@@ -544,6 +544,12 @@ def __init__(self, k=1., theta=1., shift=0., flip=False):
             Ls.append(LaguerrePolynomials())
         self.polys = TensorialPolynomials(polys1d=Ls)
 
+        self.standard_domain = np.zeros([2, 1])
+        self.standard_domain[0, :] = 0.
+        self.standard_domain[1, :] = np.inf
+
+        self.poly_domain = self.standard_domain
+
         self.indices = None
 
     def MC_samples(self, M=100):
@@ -1164,7 +1170,8 @@ def MC_samples(self, M=100):
         p = np.zeros([M, self.dim])
         counter = 0
         for dist in self.distributions:
-            p[:, range(counter, counter+dist.dim)] = dist.MC_samples(M=M)
+            p[:, range(counter, counter+dist.dim)] = np.reshape(dist.MC_samples(M=M), [M, dist.dim])
+            #p[:, range(counter, counter+dist.dim)] = dist.MC_samples(M=M)
             counter += dist.dim
 
         # Each component distribution already applies