Merge branch 'master' into develop

SALib · Mar 4, 2019 · dfb1f30 · dfb1f30
2 parents 53ce281 + 5076e4e
commit dfb1f30
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/src/SALib/analyze/delta.py b/src/SALib/analyze/delta.py
@@ -69,15 +69,20 @@ def analyze(problem, X, Y, num_resamples=10,
     if print_to_console:
         print("Parameter %s %s %s %s" % keys)
 
-    for i in range(D):
-        S['delta'][i], S['delta_conf'][i] = bias_reduced_delta(
-            Y, Ygrid, X[:, i], m, num_resamples, conf_level)
-        S['S1'][i] = sobol_first(Y, X[:, i], m)
-        S['S1_conf'][i] = sobol_first_conf(
-            Y, X[:, i], m, num_resamples, conf_level)
-        if print_to_console:
-            print("%s %f %f %f %f" % (problem['names'][i], S['delta'][
-                  i], S['delta_conf'][i], S['S1'][i], S['S1_conf'][i]))
+    try:
+        for i in range(D):
+            S['delta'][i], S['delta_conf'][i] = bias_reduced_delta(
+                Y, Ygrid, X[:, i], m, num_resamples, conf_level)
+            S['S1'][i] = sobol_first(Y, X[:, i], m)
+            S['S1_conf'][i] = sobol_first_conf(
+                Y, X[:, i], m, num_resamples, conf_level)
+            if print_to_console:
+                print("%s %f %f %f %f" % (problem['names'][i], S['delta'][
+                    i], S['delta_conf'][i], S['S1'][i], S['S1_conf'][i]))
+    except np.linalg.LinAlgError as e:
+        msg = "Singular matrix detected\n\
+             Sample size of {} may be too small".format(Y.size)
+        raise np.linalg.LinAlgError(msg)
 
     return S