Changeset c1a888b in sasmodels

Timestamp:

Apr 8, 2016 7:38:35 PM (8 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:

9a943d0

Parents:

f6029fd

Message:

fix type signature errors

Location:

sasmodels

Files:

• kernelpy.py (modified) (1 diff)
• model_test.py (modified) (1 diff)
• modelinfo.py (modified) (7 diffs)

sasmodels/kernelpy.py

@@ -14 +14 @@
 
 try:
-    from typing import Union
+    from typing import Union, Callable
 except:
     pass

sasmodels/model_test.py

@@ -323 +323 @@
 
 def model_tests():
-    # type: () -> Iterator[Callable[[], None]
+    # type: () -> Iterator[Callable[[], None]]
     """
     Test runner visible to nosetests.

sasmodels/modelinfo.py

@@ -83 +83 @@
     # if limits is a list of strings, then this is a choice list
     # field, and limits are 1 to length of string list
+    choices = []  # type: List[str]
     if isinstance(limits, list) and all(isstr(k) for k in limits):
         choices = limits
-        limits = [0, len(choices)-1]
-    else:
-        choices = []
+        limits = (0., len(choices)-1.)
+
     # TODO: maybe allow limits of None for (-inf, inf)
     try:
@@ -276 +276 @@
     def __init__(self, name, units='', default=None, limits=(-np.inf, np.inf),
                  ptype='', description=''):
-        # type: (str, str, float, Limits, str, str)
+        # type: (str, str, float, Limits, str, str) -> None
         self.id = name.split('[')[0].strip() # type: str
         self.name = name                     # type: str
@@ -327 +327 @@
 
     def as_call_reference(self, prefix=""):
-        # type: () -> str
+        # type: (str) -> str
         # Note: if the parameter is a struct type, then we will need to use
         # &prefix+id.  For scalars and vectors we can just use prefix+id.
@@ -549 +549 @@
 
         # Gather entries such as name[n] into groups of the same n
-        dependent = dict((p.id, []) for p in control)
+        dependent = dict((p.id, []) for p in control)  # type: Dict[str, List[Parameter]]
         for p in self.kernel_parameters:
             if p.length_control is not None:
@@ -555 +555 @@
 
         # Gather entries such as name[4] into groups of the same length
-        fixed = {}
+        fixed = {}  # type: Dict[int, List[Parameter]]
         for p in self.kernel_parameters:
             if p.length > 1 and p.length_control is None:
@@ -617 +617 @@
     info = ModelInfo()
     #print("make parameter table", kernel_module.parameters)
-    parameters = make_parameter_table(kernel_module.parameters)
+    parameters = make_parameter_table(getattr(kernel_module, 'parameters', []))
     demo = expand_pars(parameters, getattr(kernel_module, 'demo', None))
     filename = abspath(kernel_module.__file__)
@@ -713 +713 @@
     source = None           # type: List[str]
     tests = None            # type: List[TestCondition]
-    ER = None               # type: Optional[Callable[[np.ndarray, ...], np.ndarray]]
-    VR = None               # type: Optional[Callable[[np.ndarray, ...], Tuple[np.ndarray, np.ndarray]]]
-    form_volume = None      # type: Optional[Callable[[np.ndarray, ...], float]]
-    Iq = None               # type: Optional[Callable[[np.ndarray, ...], np.ndarray]]
-    Iqxy = None             # type: Optional[Callable[[np.ndarray, ...], np.ndarray]]
-    profile = None
-    sesans = None
+    ER = None               # type: Optional[Callable[[np.ndarray], np.ndarray]]
+    VR = None               # type: Optional[Callable[[np.ndarray], Tuple[np.ndarray, np.ndarray]]]
+    form_volume = None      # type: Optional[Callable[[np.ndarray], float]]
+    Iq = None               # type: Optional[Callable[[np.ndarray], np.ndarray]]
+    Iqxy = None             # type: Optional[Callable[[np.ndarray], np.ndarray]]
+    profile = None          # type: Optional[Callable[[np.ndarray], None]]
+    sesans = None           # type: Optional[Callable[[np.ndarray], np.ndarray]]
     mono_details = None     # type: CallDetails