Changeset e3efa6b3 in sasview for park-1.2.1/park/expression.py

Timestamp:

May 15, 2014 11:23:22 AM (10 years ago)

Author:

pkienzle

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:

4e9f227

Parents:

76f132a

Message:

restructure bumps wrapper and add levenberg-marquardt

File:

• park-1.2.1/park/expression.py (modified) (3 diffs)

park-1.2.1/park/expression.py

@@ -160 +160 @@
 """%("\n    ".join(exprs),"\n    ".join(code))
 
-    #print "Function:",function
+    #print "Function:",functiondef
     exec functiondef in globals,locals
     retfn = locals['eval_expressions']
@@ -185 +185 @@
     # Check symbol rename
     assert substitute(expr,{'a.b.x':'Q'}) == 'Q + sin(4*pi*a.c) + Q/a.b'
+    assert substitute(expr,{'a.b':'Q'}) == 'a.b.x + sin(4*pi*a.c) + a.b.x/Q'
 
 
@@ -249 +250 @@
     for expr in ['G4.cage', 'M0.cage', 'M1.G1 + *2', 
                  'piddle',
-                 'import sys; print "p0wned"',
+                 '5; import sys; print "p0wned"',
                  '__import__("sys").argv']:
         try: