Changeset aafa962 in sasview for Invariant/test

Timestamp:

Jan 16, 2010 12:44:34 PM (15 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:

52070a1

Parents:

82703a1

Message:

invariant: minor code refactor

Location:

Invariant/test

Files:

• PolySpheres.txt (modified) (1 diff)
• utest_data_handling.py (modified) (8 diffs)
• utest_use_cases.py (modified) (5 diffs)

Invariant/test/PolySpheres.txt

@@ +1 @@
+0 0 0
 0.003   5.58459588740281        1.18158747955905
 0.0031098987853131      5.58031083426704        0.590567038651574

Invariant/test/utest_data_handling.py

@@ -31 +31 @@
         
         # Create invariant object. Background and scale left as defaults.
-        fit = invariant.FitFunctor(data=self.data)
+        fit = invariant.Extrapolator(data=self.data)
         a,b = fit.fit()
 
@@ -48 +48 @@
             
         # Create invariant object. Background and scale left as defaults.
-        fit = invariant.FitFunctor(data=self.data)
+        fit = invariant.Extrapolator(data=self.data)
         a,b = fit.fit()
 
@@ -113 +113 @@
         """
         self.scale = 1.5
-        self.rg = 70.0
+        self.rg = 30.0
         x = numpy.arange(0.0001, 0.1, 0.0001)
         y = numpy.asarray([self.scale * math.exp( -(q*self.rg)**2 / 3.0 ) for q in x])
@@ -129 +129 @@
         
         self.assertEqual(inv._low_extrapolation_npts, 20)
-        self.assertEqual(inv._low_extrapolation_function.__name__, 'guinier')
+        self.assertEqual(inv._low_extrapolation_function.__class__, invariant.Guinier)
         
         # Data boundaries for fiiting
@@ -136 +136 @@
         
         # Extrapolate the low-Q data
-        a, b = inv._fit(function=inv._low_extrapolation_function,
+        a, b = inv._fit(model=inv._low_extrapolation_function,
                           qmin=qmin,
                           qmax=qmax,
@@ -172 +172 @@
         
         self.assertEqual(inv._low_extrapolation_npts, 20)
-        self.assertEqual(inv._low_extrapolation_function.__name__, 'power_law')
+        self.assertEqual(inv._low_extrapolation_function.__class__, invariant.PowerLaw)
         
         # Data boundaries for fitting
@@ -179 +179 @@
         
         # Extrapolate the low-Q data
-        a, b = inv._fit(function=inv._low_extrapolation_function,
+        a, b = inv._fit(model=inv._low_extrapolation_function,
                           qmin=qmin,
                           qmax=qmax,
@@ -186 +186 @@
         self.assertAlmostEqual(self.scale, a, 6)
         self.assertAlmostEqual(self.m, b, 6)
-    
+        
+class TestLinearization(unittest.TestCase):
+    
+    def test_guinier_incompatible_length(self):
+        g = invariant.Guinier()
+        self.assertRaises(AssertionError, g.linearize_data, [1],[1,2],None)
+        self.assertRaises(AssertionError, g.linearize_data, [1,2],[1,2],[1])
+    
+    def test_linearization(self):
+        """
+            Check that the linearization process filters out points
+            that can't be transformed
+        """
+        x = numpy.asarray(numpy.asarray([0,1,2,3]))
+        y = numpy.asarray(numpy.asarray([1,1,1,1]))
+        g = invariant.Guinier()
+        x_out, y_out, dy_out = g.linearize_data(x,y,None)
+        self.assertEqual(len(x_out), 3)
+        self.assertEqual(len(y_out), 3)
+        self.assertEqual(len(dy_out), 3)
+    

Invariant/test/utest_use_cases.py

@@ -3 +3 @@
   
 """
+#TODO: there's no test for smeared extrapolation
 import unittest
 import numpy
@@ -24 +25 @@
         
         # Create invariant object. Background and scale left as defaults.
-        fit = invariant.FitFunctor(data=self.data)
+        fit = invariant.Extrapolator(data=self.data)
         
         ##Without holding
@@ -40 +41 @@
         
         # Create invariant object. Background and scale left as defaults.
-        fit = invariant.FitFunctor(data=self.data)
+        fit = invariant.Extrapolator(data=self.data)
         
         #With holding a = -power =4
@@ -62 +63 @@
         
         # Create invariant object. Background and scale left as defaults.
-        fit = invariant.FitFunctor(data=self.data)
+        fit = invariant.Extrapolator(data=self.data)
         
         ##Without holding
@@ -78 +79 @@
         
         # Create invariant object. Background and scale left as defaults.
-        fit = invariant.FitFunctor(data=self.data)
+        fit = invariant.Extrapolator(data=self.data)
         
         #With holding a = -power =4