Changeset ae60f86 in sasview for sansmodels/src/sans/models/test/utest_newstylemodels.py

Timestamp:

Oct 14, 2008 8:13:28 AM (16 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:

8809e48

Parents:

4fe4394

Message:

changing base model

File:

• sansmodels/src/sans/models/test/utest_newstylemodels.py (modified) (3 diffs)

sansmodels/src/sans/models/test/utest_newstylemodels.py

@@ -3 +3 @@
     C++ model classes
 """
-
+print "New style models are still under development"
 import unittest, math, numpy
 
@@ -22 +22 @@
         return self.params['scale']*x
 
-from BaseModel import BaseModel
+from sans.models.BaseModel import BaseModel,ParameterProperty
 class NewTestModel(BaseModel):
     scale = ParameterProperty('scale')
@@ -57 +57 @@
     """
     def setUp(self):
-        from sans.models.NewCylinderModel import NewCylinderModel
-        self.model = NewCylinderModel()
+        from sans.models.NewCylinderModel import CylinderModel
+        self.model = CylinderModel()
         
         
     def test_setparam(self):
-        pass
+        self.model.setParam("length", 151.0)
+        self.assertEquals(self.model.getParam("length"), 151.0)
+        
+        
+        print self.model.parameters
+        
+        print self.model(0.001)
+        self.model.setParam("length", 250.0)
+        print self.model(0.001)