Changeset 37dea17 in sasview

Timestamp:

May 29, 2012 6:01:32 PM (12 years ago)

Author:

Jae Cho <jhjcho@…>

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:

a1fa589

Parents:

5617775

Message:

reduced # of 2D data points

File:

• sansdataloader/test/utest_manipulations.py (modified) (10 diffs)

sansdataloader/test/utest_manipulations.py

@@ -133 +133 @@
     def setUp(self):
         # Create two data sets to play with
-        x_0 = 2.0*numpy.ones(100)
-        dx_0 = 0.5*numpy.ones(100)
-        qx_0 = numpy.arange(100)
-        qy_0 = numpy.arange(100)
-        mask_0 = numpy.zeros(100)
-        dqx_0 = numpy.arange(100)/100
-        dqy_0 = numpy.arange(100)/100
+        x_0 = 2.0*numpy.ones(25)
+        dx_0 = 0.5*numpy.ones(25)
+        qx_0 = numpy.arange(25)
+        qy_0 = numpy.arange(25)
+        mask_0 = numpy.zeros(25)
+        dqx_0 = numpy.arange(25)/100
+        dqy_0 = numpy.arange(25)/100
         q_0 = numpy.sqrt(qx_0 * qx_0 + qy_0 * qy_0)
         self.data = Data2D(x_0, dx_0, qx_0, qy_0, q_0, mask_0, dqx_0, dqy_0)
         
-        y = numpy.ones(100)
-        dy = numpy.ones(100)
-        qx = numpy.arange(100)
-        qy = numpy.arange(100)
-        mask = numpy.zeros(100)
+        y = numpy.ones(25)
+        dy = numpy.ones(25)
+        qx = numpy.arange(25)
+        qy = numpy.arange(25)
+        mask = numpy.zeros(25)
         q = numpy.sqrt(qx * qx + qy * qy)
         self.data2 = Data2D(y, dy, qx, qy, q, mask)
@@ -157 +157 @@
         """
         # There should be 5 entries in the file
-        self.assertEqual(numpy.size(self.data.data), 100)
-        
-        for i in range(100):
+        self.assertEqual(numpy.size(self.data.data), 25)
+        
+        for i in range(25):
             # All y-error values should be 0.5
             self.assertEqual(self.data.err_data[i], 0.5)    
@@ -168 +168 @@
     def test_add(self):
         result = self.data2+self.data
-        for i in range(100):
+        for i in range(25):
             self.assertEqual(result.data[i], 3.0)
             self.assertEqual(result.err_data[i], math.sqrt(0.5**2+1.0))
@@ -174 +174 @@
     def test_sub(self):
         result = self.data2-self.data
-        for i in range(100):
+        for i in range(25):
                 self.assertEqual(result.data[i], -1.0)
                 self.assertEqual(result.err_data[i], math.sqrt(0.5**2+1.0))
@@ -180 +180 @@
     def test_mul(self):
         result = self.data2*self.data
-        for i in range(100):
+        for i in range(25):
             self.assertEqual(result.data[i], 2.0)
             self.assertEqual(result.err_data[i], math.sqrt((0.5*1.0)**2+(1.0*2.0)**2))
@@ -186 +186 @@
     def test_div(self):
         result = self.data2/self.data
-        for i in range(100):
+        for i in range(25):
             self.assertEqual(result.data[i], 0.5)
             self.assertEqual(result.err_data[i], math.sqrt((1.0/2.0)**2+(0.5*1.0/4.0)**2))
@@ -192 +192 @@
     def test_radd(self):
         result = self.data+3.0
-        for i in range(100):
+        for i in range(25):
             self.assertEqual(result.data[i], 5.0)
             self.assertEqual(result.err_data[i], 0.5)
             
         result = 3.0+self.data
-        for i in range(100):
+        for i in range(25):
             self.assertEqual(result.data[i], 5.0)
             self.assertEqual(result.err_data[i], 0.5)
@@ -203 +203 @@
     def test_rsub(self):
         result = self.data-3.0
-        for i in range(100):
+        for i in range(25):
             self.assertEqual(result.data[i], -1.0)
             self.assertEqual(result.err_data[i], 0.5)
             
         result = 3.0-self.data
-        for i in range(100):
+        for i in range(25):
             self.assertEqual(result.data[i], 1.0)
             self.assertEqual(result.err_data[i], 0.5)
@@ -214 +214 @@
     def test_rmul(self):
         result = self.data*3.0
-        for i in range(100):
+        for i in range(25):
             self.assertEqual(result.data[i], 6.0)
             self.assertEqual(result.err_data[i], 1.5)
             
         result = 3.0*self.data
-        for i in range(100):
+        for i in range(25):
             self.assertEqual(result.data[i], 6.0)
             self.assertEqual(result.err_data[i], 1.5)
@@ -225 +225 @@
     def test_rdiv(self):
         result = self.data/4.0
-        for i in range(100):
+        for i in range(25):
             self.assertEqual(result.data[i], 0.5)
             self.assertEqual(result.err_data[i], 0.125)
             
         result = 6.0/self.data
-        for i in range(100):
+        for i in range(25):
             self.assertEqual(result.data[i], 3.0)
             self.assertEqual(result.err_data[i], 6.0*0.5/4.0)