Changeset 9a943d0 in sasmodels

Timestamp:

Apr 8, 2016 10:15:52 PM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

f619de7

Parents:

c1a888b

Message:

remove a few more type check warnings

Location:

sasmodels

Files:

• kernelpy.py (modified) (1 diff)
• modelinfo.py (modified) (6 diffs)

sasmodels/kernelpy.py

@@ -164 +164 @@
         self.q_input = None
 
-def _loops(parameters,  # type: np.ndarray
-           form,        # type: Callable[[], np.ndarray]
-           form_volume, # type: Callable[[], float]
-           nq,          # type: int
-           call_details,# type: details.CallDetails
-           weights,     # type: np.ndarray
-           values,      # type: np.ndarray
-           cutoff,      # type: float
-           ):           # type: (...) -> None
+def _loops(parameters, form, form_volume, nq, call_details,
+           weights, values, cutoff):
+    # type: (np.ndarray, Callable[[], np.ndarray], Callable[[], float], int, details.CallDetails, np.ndarray, np.ndarray, float) -> None
     ################################################################
     #                                                              #

sasmodels/modelinfo.py

@@ -22 +22 @@
     from .details import CallDetails
     Limits = Tuple[float, float]
-    LimitsOrChoice = Union[Limits, Tuple[str]]
-    ParameterDef = Tuple[str, str, float, LimitsOrChoice, str, str]
+    #LimitsOrChoice = Union[Limits, Tuple[str]]
+    ParameterDef = Tuple[str, str, float, Limits, str, str]
     ParameterSetUser = Dict[str, Union[float, List[float]]]
     ParameterSet = Dict[str, float]
@@ -42 +42 @@
 # depends on the some polydisperse parameter with the current implementation
 COMMON_PARAMETERS = [
-    ["scale", "", 1, [0, np.inf], "", "Source intensity"],
-    ["background", "1/cm", 1e-3, [0, np.inf], "", "Source background"],
+    ("scale", "", 1, (0.0, np.inf), "", "Source intensity"),
+    ("background", "1/cm", 1e-3, (0.0, np.inf), "", "Source background"),
 ]
 assert (len(COMMON_PARAMETERS) == 2
@@ -69 +69 @@
 def parse_parameter(name, units='', default=np.NaN,
                     limits=(-np.inf, np.inf), ptype='', description=''):
-    # type: (str, str, float, LimitsOrChoice, str, str) -> Parameter
+    # type: (str, str, float, Limits, str, str) -> Parameter
     """
     Parse an individual parameter from the parameter definition block.
@@ -174 +174 @@
         lookup = dict((p.id, p) for p in partable.kernel_parameters)
         result = partable.defaults.copy()
+        scalars = dict((name, value) for name, value in pars.items()
+                       if name not in lookup or lookup[name].length == 1)
         vectors = dict((name,value) for name,value in pars.items()
                        if name in lookup and lookup[name].length > 1)
         if vectors:
-            scalars = dict((name, value) for name, value in pars.items()
-                           if name not in lookup or lookup[name].length == 1)
             for name, value in vectors.items():
                 if np.isscalar(value):
@@ -192 +192 @@
                     for (k,v) in enumerate(value):
                         scalars[name+str(k)] = v
-            result.update(scalars)
-        else:
-            result.update(pars)
+        result.update(scalars)
 
     return result
@@ -642 +640 @@
     # TODO: check the structure of the tests
     info.tests = getattr(kernel_module, 'tests', [])
-    info.ER = getattr(kernel_module, 'ER', None)
-    info.VR = getattr(kernel_module, 'VR', None)
-    info.form_volume = getattr(kernel_module, 'form_volume', None)
-    info.Iq = getattr(kernel_module, 'Iq', None)
-    info.Iqxy = getattr(kernel_module, 'Iqxy', None)
-    info.profile = getattr(kernel_module, 'profile', None)
-    info.sesans = getattr(kernel_module, 'sesans', None)
+    info.ER = getattr(kernel_module, 'ER', None) # type: ignore
+    info.VR = getattr(kernel_module, 'VR', None) # type: ignore
+    info.form_volume = getattr(kernel_module, 'form_volume', None) # type: ignore
+    info.Iq = getattr(kernel_module, 'Iq', None) # type: ignore
+    info.Iqxy = getattr(kernel_module, 'Iqxy', None) # type: ignore
+    info.profile = getattr(kernel_module, 'profile', None) # type: ignore
+    info.sesans = getattr(kernel_module, 'sesans', None) # type: ignore
 
     # Precalculate the monodisperse parameter details