Changeset 88d2e70 in sasview for test/sasrealspace/test
- Timestamp:
- Oct 11, 2018 12:03:40 PM (6 years ago)
- Branches:
- master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1249
- Children:
- 7c4bb4d
- Parents:
- e090ba90
- Location:
- test/sasrealspace/test
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
test/sasrealspace/test/utest_oriented.py
r1cdbcd8 r88d2e70 59 59 ana_val = self.ana.runXY([0.1, 0.1]) 60 60 sim_val = self.model.getIq2D(0.1, 0.1) 61 self.assert _( math.fabs(sim_val/ana_val-1.0)<0.1 )61 self.assertTrue( math.fabs(sim_val/ana_val-1.0)<0.1 ) 62 62 63 63 class TestCylinderAddObject(unittest.TestCase): … … 101 101 #print ana_val, sim_val, sim_val/ana_val 102 102 103 self.assert _( math.fabs(sim_val/ana_val-1.0)<0.05 )103 self.assertTrue( math.fabs(sim_val/ana_val-1.0)<0.05 ) 104 104 105 105 … … 143 143 #print ana_val, sim_val, sim_val/ana_val 144 144 145 self.assert _( math.fabs(sim_val/ana_val-1.0)<0.05 )145 self.assertTrue( math.fabs(sim_val/ana_val-1.0)<0.05 ) 146 146 147 147 def testalongZ(self): … … 156 156 #print ana_val, sim_val, sim_val/ana_val 157 157 158 self.assert _( math.fabs(sim_val/ana_val-1.0)<0.05 )158 self.assertTrue( math.fabs(sim_val/ana_val-1.0)<0.05 ) 159 159 160 160 def testalongX(self): … … 169 169 #print ana_val, sim_val, sim_val/ana_val 170 170 171 self.assert _( math.fabs(sim_val/ana_val-1.0)<0.05 )171 self.assertTrue( math.fabs(sim_val/ana_val-1.0)<0.05 ) 172 172 173 173 class TestEllipsoid(unittest.TestCase): … … 213 213 #print ana_val, sim_val, sim_val/ana_val 214 214 215 self.assert _( math.fabs(sim_val/ana_val-1.0)<0.05 )215 self.assertTrue( math.fabs(sim_val/ana_val-1.0)<0.05 ) 216 216 217 217 def testalongZ(self): … … 226 226 #print ana_val, sim_val, sim_val/ana_val 227 227 228 self.assert _( math.fabs(sim_val/ana_val-1.0)<0.05 )228 self.assertTrue( math.fabs(sim_val/ana_val-1.0)<0.05 ) 229 229 230 230 def testalongY(self): … … 240 240 241 241 try: 242 self.assert _( math.fabs(sim_val/ana_val-1.0)<0.05 )242 self.assertTrue( math.fabs(sim_val/ana_val-1.0)<0.05 ) 243 243 except Exception: 244 244 print("Error", ana_val, sim_val, sim_val/ana_val) … … 295 295 sim_val, err = self.canvas.getIq2DError(0.1, 0.2) 296 296 297 self.assert _( math.fabs(sim_val/ana_val-1.0)<0.05 )297 self.assertTrue( math.fabs(sim_val/ana_val-1.0)<0.05 ) 298 298 299 299 class TestCoreShellError(unittest.TestCase): … … 347 347 sim_val, err = self.canvas.getIq2DError(0.1, 0.2) 348 348 349 self.assert _( math.fabs(sim_val-ana_val) < 3.0 * err )349 self.assertTrue( math.fabs(sim_val-ana_val) < 3.0 * err ) 350 350 351 351 class TestRunMethods(unittest.TestCase): … … 392 392 393 393 try: 394 self.assert _( math.fabs(sim_val/ana_val-1.0)<0.05 )394 self.assertTrue( math.fabs(sim_val/ana_val-1.0)<0.05 ) 395 395 except Exception: 396 396 print("Error", ana_val, sim_val, sim_val/ana_val) … … 404 404 405 405 try: 406 self.assert _( math.fabs(sim_val/ana_val-1.0)<0.05 )406 self.assertTrue( math.fabs(sim_val/ana_val-1.0)<0.05 ) 407 407 except Exception: 408 408 print("Error", ana_val, sim_val, sim_val/ana_val) … … 416 416 417 417 try: 418 self.assert _( math.fabs(sim_val/ana_val-1.0)<0.05 )418 self.assertTrue( math.fabs(sim_val/ana_val-1.0)<0.05 ) 419 419 except Exception: 420 420 print("Error", ana_val, sim_val, sim_val/ana_val) … … 428 428 429 429 try: 430 self.assert _( math.fabs(sim_val/ana_val-1.0)<0.05 )430 self.assertTrue( math.fabs(sim_val/ana_val-1.0)<0.05 ) 431 431 except Exception: 432 432 print("Error", ana_val, sim_val, sim_val/ana_val) … … 471 471 sim_val = self.model.getIq2D(0.1, 0.2) 472 472 473 self.assert _( math.fabs(sim_val/ana_val-1.0)<0.05 )473 self.assertTrue( math.fabs(sim_val/ana_val-1.0)<0.05 ) 474 474 475 475 # Change the radius a re-evaluate … … 479 479 ana_val = self.ana.runXY([0.1, 0.2]) 480 480 sim_val = self.model.getIq2D(0.1, 0.2) 481 self.assert _( math.fabs(sim_val/ana_val-1.0)<0.05 )481 self.assertTrue( math.fabs(sim_val/ana_val-1.0)<0.05 ) 482 482 483 483 -
test/sasrealspace/test/utest_realspace.py
r1cdbcd8 r88d2e70 38 38 self.model.add('ellipsoid','elli2') 39 39 self.model.delete('elli2') 40 self.assert _('elli2' not in self.model.getShapeList())40 self.assertTrue('elli2' not in self.model.getShapeList()) 41 41 42 42 def testsetParam(self): … … 81 81 value_2 = self.canvas.getIq(0.001) 82 82 83 self.assert _( (value_1-value_2)/value_1 < 0.1)83 self.assertTrue( (value_1-value_2)/value_1 < 0.1) 84 84 85 85 def testSetDensityTiming(self): … … 99 99 t_2 = time.time()-t_0 100 100 101 self.assert _( t_2 < t_1 and (t_1-t_2)/t_2 > 2)101 self.assertTrue( t_2 < t_1 and (t_1-t_2)/t_2 > 2) 102 102 103 103 def testGetParamList(self): 104 104 """ Test GetParamList on empty canvas""" 105 self.assert _('lores_density' in self.canvas.getParamList())105 self.assertTrue('lores_density' in self.canvas.getParamList()) 106 106 handle = self.canvas.add('sphere') 107 107 … … 109 109 """ Test GetParamList on filled canvas""" 110 110 self.canvas.add('sphere') 111 self.assert _('lores_density' in self.canvas.getParamList())111 self.assertTrue('lores_density' in self.canvas.getParamList()) 112 112 113 113 def testAdd(self): … … 151 151 # THIS WILL DEPEND ON THE NUMBER OF SPACE POINTS: 152 152 # that why we need some error analysis. 153 self.assert _( (sim_2*ana_1/sim_1 - ana_2)/ana_2 < 0.1)153 self.assertTrue( (sim_2*ana_1/sim_1 - ana_2)/ana_2 < 0.1) 154 154 155 155 # test the absolute amplitude 156 self.assert _( math.fabs(sim_2-ana_2)/ana_2 < 0.1)156 self.assertTrue( math.fabs(sim_2-ana_2)/ana_2 < 0.1) 157 157 158 158 def testGetIq2(self): … … 196 196 sim_2 = self.canvas.getIq(0.01) 197 197 198 self.assert _((sim_2-sim_1)/sim_1<0.05)198 self.assertTrue((sim_2-sim_1)/sim_1<0.05) 199 199 200 200 def testGetIq_time(self): … … 216 216 delta_2 = time.time()-t_0 217 217 218 self.assert _((delta_2-delta_1)/delta_1<0.05)218 self.assertTrue((delta_2-delta_1)/delta_1<0.05) 219 219 220 220 … … 342 342 ana = self.sphere.run(0.05) 343 343 val, err = self.canvas.getIqError(0.05) 344 self.assert _(math.fabs(ana-val)<2.0*err)344 self.assertTrue(math.fabs(ana-val)<2.0*err) 345 345 346 346 def testRightOrder(self): … … 350 350 val, err = self.canvas.getIqError(0.05) 351 351 #print 'right', ana, val, err 352 self.assert _(math.fabs(ana-val)/ana < 1.1)352 self.assertTrue(math.fabs(ana-val)/ana < 1.1) 353 353 354 354 def testWrongOrder(self): … … 365 365 val, err = self.canvas.getIqError(0.05) 366 366 #print 'wrong', ana, val, err 367 self.assert _(math.fabs(ana-val)/ana < 1.1)367 self.assertTrue(math.fabs(ana-val)/ana < 1.1) 368 368 369 369
Note: See TracChangeset
for help on using the changeset viewer.