Changes in sasmodels/compare_many.py [f72d70a:424fe00] in sasmodels

File:

• sasmodels/compare_many.py (modified) (8 diffs)

sasmodels/compare_many.py

@@ -106 +106 @@
     header = ('\n"Model","%s","Count","%d","Dimension","%s"'
               % (name, N, "2D" if is_2d else "1D"))
-    if not mono:
-        header += ',"Cutoff",%g'%(cutoff,)
+    if not mono: header += ',"Cutoff",%g'%(cutoff,)
     print(header)
 
@@ -162 +161 @@
     max_diff = [0]
     for k in range(N):
-        print("Model %s %d"%(name, k+1), file=sys.stderr)
+        print("%s %d"%(name, k), file=sys.stderr)
         seed = np.random.randint(1e6)
         pars_i = randomize_pars(model_info, pars, seed)
         constrain_pars(model_info, pars_i)
-        if 'sasview' in (base, comp):
-            constrain_new_to_old(model_info, pars_i)
+        constrain_new_to_old(model_info, pars_i)
         if mono:
             pars_i = suppress_pd(pars_i)
@@ -189 +187 @@
     Print the command usage string.
     """
-    print("usage: compare_many.py MODEL COUNT (1dNQ|2dNQ) (CUTOFF|mono) (single|double|quad)",
-          file=sys.stderr)
+    print("usage: compare_many.py MODEL COUNT (1dNQ|2dNQ) (CUTOFF|mono) (single|double|quad)")
 
 
@@ -207 +204 @@
     print("""\
 
-MODEL is the model name of the model or one of the model types listed in
-sasmodels.core.list_models (all, py, c, double, single, opencl, 1d, 2d,
-nonmagnetic, magnetic).  Model types can be combined, such as 2d+single.
+MODEL is the model name of the model or "all" for all the models
+in alphabetical order.
 
 COUNT is the number of randomly generated parameter sets to try. A value
@@ -224 +220 @@
 below the cutoff will be ignored.  Use "mono" for monodisperse models.  The
 choice of polydisperse parameters, and the number of points in the distribution
-is set in compare.py defaults for each model.  Polydispersity is given in the
-"demo" attribute of each model.
+is set in compare.py defaults for each model.
 
 PRECISION is the floating point precision to use for comparisons.  If two
-precisions are given, then compare one to the other.  Precision is one of
-fast, single, double for GPU or single!, double!, quad! for DLL.  If no
-precision is given, then use single and double! respectively.
+precisions are given, then compare one to the other, ignoring sasview.
 
 Available models:
@@ -240 +233 @@
     Main program.
     """
-    if len(argv) not in (3, 4, 5, 6):
+    if len(argv) not in (5, 6):
         print_help()
         return
 
-    target = argv[0]
-    try:
-        model_list = [target] if target in MODELS else core.list_models(target)
-    except ValueError:
-        print('Bad model %s.  Use model type or one of:' % target, file=sys.stderr)
+    model = argv[0]
+    if not (model in MODELS) and (model != "all"):
+        print('Bad model %s.  Use "all" or one of:'%model)
         print_models()
-        print('model types: all, py, c, double, single, opencl, 1d, 2d, nonmagnetic, magnetic')
         return
     try:
@@ -257 +247 @@
         assert argv[2][1] == 'd'
         Nq = int(argv[2][2:])
-        mono = len(argv) <= 3 or argv[3] == 'mono'
+        mono = argv[3] == 'mono'
         cutoff = float(argv[3]) if not mono else 0
-        base = argv[4] if len(argv) > 4 else "single"
-        comp = argv[5] if len(argv) > 5 else "double!"
+        base = argv[4]
+        comp = argv[5] if len(argv) > 5 else "sasview"
     except Exception:
         traceback.print_exc()
@@ -268 +258 @@
     data, index = make_data({'qmax':1.0, 'is2d':is2D, 'nq':Nq, 'res':0.,
                              'accuracy': 'Low', 'view':'log', 'zero': False})
+    model_list = [model] if model != "all" else MODELS
     for model in model_list:
         compare_instance(model, data, index, N=count, mono=mono,