Changeset 8c65a33 in sasmodels

Timestamp:

Nov 9, 2016 11:06:42 AM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

88fafac

Parents:

23ae1d6

Message:

change model-model comparison to use , because : is the windows drive separator, and models may be specified with the full path

File:

• sasmodels/compare.py (modified) (5 diffs)

sasmodels/compare.py

@@ -60 +60 @@
 sasmodels rewrite.
 
-model is the name of the model to compare (see below).
+model or model1,model2 are the names of the models to compare (see below).
 N1 is the number of times to run sasmodels (default=1).
 N2 is the number times to run sasview (default=1).
@@ -92 +92 @@
     -sasview sets the sasview calculation engine
 
-The default is -single -sasview.  Note that the interpretation of quad
+The default is -single -double.  Note that the interpretation of quad
 precision depends on architecture, and may vary from 64-bit to 128-bit,
 with 80-bit floats being common (1e-19 precision).
 
 Key=value pairs allow you to set specific values for the model parameters.
+Key=value1,value2 to compare different values of the same parameter.
+value can be an expression including other parameters
 """
 
@@ -885 +887 @@
     return isfloat or INTEGER_RE.match(str)
 
+# For distinguishing pairs of models for comparison
+# key-value pair separator =
+# shell characters  | & ; <> $ % ' " \ # `
+# model and parameter names _
+# parameter expressions - + * / . ( )
+# path characters including tilde expansion and windows drive ~ / :
+# not sure about brackets [] {}
+# maybe one of the following @ ? ^ ! ,
+MODEL_SPLIT = ','
 def parse_opts(argv):
     # type: (List[str]) -> Dict[str, Any]
@@ -987 +998 @@
     # pylint: enable=bad-whitespace
 
-    if ':' in name:
-        name, name2 = name.split(':',2)
+    if MODEL_SPLIT in name:
+        name, name2 = name.split(MODEL_SPLIT, 2)
     else:
         name2 = name
@@ -1036 +1047 @@
             print("%r invalid; parameters are: %s"%(k, ", ".join(sorted(s))))
             return None
-        v1, v2 = v.split(':',2) if ':' in v else (v,v)
+        v1, v2 = v.split(MODEL_SPLIT, 2) if MODEL_SPLIT in v else (v,v)
         if v1 and k in pars:
             presets[k] = float(v1) if isnumber(v1) else v1