Changeset 7d64b0e in sasview for test/sasmodels

Timestamp:

Mar 12, 2015 10:32:08 AM (10 years ago)

Author:

krzywon

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:

bb074b3

Parents:

d26dea0 (diff), ac1670a2 (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' of ​https://github.com/SasView/sasview.git

File:

• test/sasmodels/test/utest_other_models.py (modified) (2 diffs)

test/sasmodels/test/utest_other_models.py

@@ -899 +899 @@
     def test1D(self):
         """ Test 1D model for a LamellarPS Model"""
-        self.assertAlmostEquals(self.comp.run(0.001), 27899.30836, 1)
+        self.assertAlmostEquals(self.comp.run(0.001), 28895.13397, 1)
         
     def test1D_2(self):
         """ Test 2D model for a LamellarPS Model"""
-        self.assertAlmostEquals(self.comp.run([0.001, 1.3]),27899.30836, 1) 
+        self.assertAlmostEquals(self.comp.run([0.001, 1.3]),28895.13397, 1) 
     
     def testEval_1D(self):
@@ -948 +948 @@
     def test1D(self):
         """ Test 1D model for a LamellarPSHG Model"""
-        self.assertAlmostEquals(self.comp.run(0.001),6831387.29466, 3)
+        self.assertAlmostEquals(self.comp.run(0.001),6838238.571488, 3)
         
     def test1D_2(self):
         """ Test 2D model for a LamellarPSHG Model"""
-        self.assertAlmostEquals(self.comp.run([0.001, 1.3]),6831387.29466,3)
+        self.assertAlmostEquals(self.comp.run([0.001, 1.3]),6838238.571488,3)
         
     def testEval_1D(self):