[BayesInference] modified normpdf function.

BayesValidRox/BayesInference/BayesInference.py

@@ -167,23 +167,18 @@ class BayesInference:
                 stdPCE = np.hstack((stdPCE, self.stdPCEPriorPred[outputType]))
 
             # Expected value of variance (Assump: i.i.d stds)
-            varPCE = np.mean(stdPCE**2, axis=0)
+            # varPCE = np.mean(stdPCE**2, axis=0)
+            varPCE = np.var(stdPCE, axis=1)
             np.fill_diagonal(covMatrix_PCE, varPCE)
-            
+
             covMatrix += covMatrix_PCE
         
         # Compute loglikelihood
-        # try:
-        #     logL = multivariate_normal.logpdf(TotalOutputs, mean=Data, cov=covMatrix)
-        # except:
-        #     logL = -np.inf
-
-        logL = 0
-        for i, y in enumerate(TotalOutputs):
-            res =  Data - y
-            sigma = np.sqrt(covMatrix[i,i])
-            logL += -0.5 * (np.sum((res / sigma)**2)
-                       + 1*np.log(2*np.pi*sigma**2))
+        try:
+            logL = multivariate_normal.logpdf(TotalOutputs, mean=Data, cov=covMatrix)
+        except:
+            logL = -np.inf
+        
         return logL
     
     #--------------------------------------------------------------------------------------------------------