Changeset ea59943 in sasview

Timestamp:

Nov 23, 2011 12:12:45 PM (13 years ago)

Author:

Mathieu Doucet <doucetm@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

c09ace41

Parents:

6232a6f

Message:

Re #5 improving tests

Location:

pr_inversion

Files:

• src/sans/pr/c_extensions/Cinvertor.c (modified) (3 diffs)
• src/sans/pr/invertor.py (modified) (1 diff)
• test/utest_invertor.py (modified) (2 diffs)

pr_inversion/src/sans/pr/c_extensions/Cinvertor.c

@@ -16 +16 @@
 
 /// Error object for raised exceptions
-static PyObject * CinvertorError = NULL;
+PyObject * CinvertorError;
 
 #define INVECTOR(obj,buf,len)                                                                           \
@@ -903 +903 @@
     for (j=0; j<nfunc; j++) {
         for (i=0; i<self->params.npoints; i++) {
+            if (self->params.err[i]==0.0) {
+              PyErr_SetString(CinvertorError,
+                "Cinvertor.get_matrix: Some I(Q) points have no error.");
+              return NULL;
+            }
             if (accept_q(self, self->params.x[i])){
                 if (self->params.has_bck==1 && j==0) {
@@ -1126 +1131 @@
 
     d = PyModule_GetDict(module);
-    CinvertorError = PyErr_NewException("Cinvertor.error", NULL, NULL);
+    CinvertorError = PyErr_NewException("sans.pr.invertor.Cinvertor.InvertorError", PyExc_RuntimeError, NULL);
     PyDict_SetItemString(d, "CinvertorError", CinvertorError);
 }

pr_inversion/src/sans/pr/invertor.py

@@ -455 +455 @@
         # Construct the a matrix and b vector that represent the problem
         t_0 = time.time()
-        self._get_matrix(nfunc, nq, a, b)
+        try:
+            self._get_matrix(nfunc, nq, a, b)
+        except:
+            raise RuntimeError, "Invertor: could not invert I(Q)\n  %s" % sys.exc_value
              
         # Perform the inversion (least square fit)

pr_inversion/test/utest_invertor.py

@@ -481 +481 @@
         self.invertor.err = err
         # Perform inversion
-        self.assertRaises(numpy.linalg.LinAlgError, self.invertor.invert, 10)
-         
+        self.assertRaises(RuntimeError, self.invertor.invert, 10)
         
     def test_invalid(self):
@@ -599 +598 @@
        
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main(testRunner=unittest.TextTestRunner(verbosity=2))