Changeset 04dc697 in sasmodels for sasmodels/sasview_model.py

Timestamp:

Apr 13, 2016 11:39:09 AM (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:

60f03de

Parents:

a18c5b3

Message:

more type hinting

File:

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

sasmodels/sasview_model.py

@@ -31 +31 @@
 
 try:
-    from typing import Dict, Mapping, Any, Sequence, Tuple, NamedTuple, List, Optional
+    from typing import Dict, Mapping, Any, Sequence, Tuple, NamedTuple, List, Optional, Union
     from .modelinfo import ModelInfo, Parameter
     from .kernel import KernelModel
@@ -42 +42 @@
 
 # TODO: separate x_axis_label from multiplicity info
-# The x-axis label belongs with the profile generating function
+# The profile x-axis label belongs with the profile generating function
 MultiplicityInfo = collections.namedtuple(
     'MultiplicityInfo',
@@ -220 +220 @@
     dispersion = None  # type: Dict[str, Any]
     #: units and limits for each parameter
-    details = None     # type: Mapping[str, Tuple(str, float, float)]
-    #: multiplicity used, or None if no multiplicity controls
+    details = None     # type: Mapping[str, Tuple[str, float, float]]
+    #: multiplicity value, or None if no multiplicity on the model
     multiplicity = None     # type: Optional[int]
+    #: memory for polydispersity array if using ArrayDispersion (used by sasview).
+    _persistency_dict = None # type: Dict[str, Tuple[np.ndarray, np.ndarray]]
 
     def __init__(self, multiplicity=None):
-        # type: () -> None
-
-        ## _persistency_dict is used by sas.perspectives.fitting.basepage
-        ## to store dispersity reference.
-        self._persistency_dict = {}
+        # type: (Optional[int]) -> None
 
         # TODO: _persistency_dict to persistency_dict throughout sasview
@@ -252 +250 @@
             hidden = set()
 
+        self._persistency_dict = {}
         self.params = collections.OrderedDict()
         self.dispersion = {}
@@ -375 +374 @@
 
     def getParamList(self):
-        # type: () - > Sequence[str]
+        # type: () -> Sequence[str]
         """
         Return a list of all available parameters for the model
         """
-        param_list = self.params.keys()
+        param_list = list(self.params.keys())
         # WARNING: Extending the list with the dispersion parameters
         param_list.extend(self.getDispParamList())
@@ -385 +384 @@
 
     def getDispParamList(self):
-        # type: () - > Sequence[str]
+        # type: () -> Sequence[str]
         """
         Return a list of polydispersity parameters for the model
@@ -398 +397 @@
 
     def clone(self):
-        # type: () - > "SasviewModel"
+        # type: () -> "SasviewModel"
         """ Return a identical copy of self """
         return deepcopy(self)
@@ -439 +438 @@
 
     def evalDistribution(self, qdist):
-        # type: (Union[np.ndarray, Tuple[np.ndarray, np.ndarray], List[np.ndarray]) -> np.ndarray
+        # type: (Union[np.ndarray, Tuple[np.ndarray, np.ndarray], List[np.ndarray]]) -> np.ndarray
         r"""
         Evaluate a distribution of q-values.