Changeset 5e903e8b in sasview for test/pr_inversion

Timestamp:

May 2, 2017 8:07:40 AM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

e123eb9

Parents:

b290a9e (diff), 658dd57 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into log_binning

Location:

test/pr_inversion

Files:

• test/utest_invertor.py (modified) (7 diffs)
• __init__.py (added)
• test/__init__.py (added)

test/pr_inversion/test/utest_invertor.py

@@ -6 +6 @@
 # Disable "too many methods" complaint 
 # pylint: disable-msg=R0904 
-
-
-import unittest, math, numpy
+from __future__ import print_function
+
+
+import os
+import unittest
+import math
+import numpy
 from sas.sascalc.pr.invertor import Invertor
-        
+
+
 class TestFiguresOfMerit(unittest.TestCase):
             
@@ -235 +240 @@
             self.assertTrue(chi2/51.0<10.0)
         except:
-            print "chi2 =", chi2/51.0
+            print("chi2 =", chi2/51.0)
             raise
         
@@ -263 +268 @@
             self.assertTrue(self.invertor.chi2/len(x)<200.00)
         except:
-            print "Chi2(I(q)) =", self.invertor.chi2/len(x)
+            print("Chi2(I(q)) =", self.invertor.chi2/len(x))
             raise
         
@@ -297 +302 @@
             self.assertTrue(chi2/51.0<50.0)
         except:
-            print "chi2(P(r)) =", chi2/51.0
+            print("chi2(P(r)) =", chi2/51.0)
             raise
         
@@ -341 +346 @@
             self.assertTrue(self.invertor.chi2>0)
         except:
-            print "Chi2 =", self.invertor.chi2
+            print("Chi2 =", self.invertor.chi2)
             raise
                             
@@ -365 +370 @@
             self.assertTrue(self.invertor.chi2>0)
         except:
-            print "Chi2 =", self.invertor.chi2
+            print("Chi2 =", self.invertor.chi2)
             raise
         
@@ -416 +421 @@
         
         # Save
-        self.invertor.to_file("test_output.txt")
+        f_name = "test_output.txt"
+        self.invertor.to_file(f_name)
     
         # Load
-        self.invertor.from_file("test_output.txt")
+        self.invertor.from_file(f_name)
         self.assertEqual(self.invertor.d_max, 160.0)
         self.assertEqual(self.invertor.alpha, 0.0007)
         self.assertEqual(self.invertor.chi2, 836.797)
         self.assertAlmostEqual(self.invertor.pr(self.invertor.out, 10.0), 903.31577041, 4)
+        if os.path.isfile(f_name):
+            os.remove(f_name)
         
     def test_qmin(self):