fixed position distrtibution reading, added helper functions for seedlists

Author: kip-hart

CHANGELOG.rst

@@ -6,6 +6,18 @@ All notable changes to this project will be documented in this file.
 The format is based on `Keep a Changelog`_,
 and this project adheres to `Semantic Versioning`_.
 
+`1.3.3`_ -  2020-08-31
+--------------------------
+Added
+'''''
+- Helper functions for SeedList class.
+
+Fixed
+'''''''
+- Dictionary conversion issue with lists of SciPy distributions.
+- XML tags in documentation on position distributions.
+
+
 `1.3.2`_ -  2020-07-11
 --------------------------
 Added
@@ -129,7 +141,8 @@ Added
 
 .. LINKS
 
-.. _`Unreleased`: https://github.com/kip-hart/MicroStructPy/compare/v1.3.2...HEAD
+.. _`Unreleased`: https://github.com/kip-hart/MicroStructPy/compare/v1.3.3...HEAD
+.. _`1.3.3`: https://github.com/kip-hart/MicroStructPy/compare/v1.3.2...v1.3.3
 .. _`1.3.2`: https://github.com/kip-hart/MicroStructPy/compare/v1.3.1...v1.3.2
 .. _`1.3.1`: https://github.com/kip-hart/MicroStructPy/compare/v1.3.0...v1.3.1
 .. _`1.3.0`: https://github.com/kip-hart/MicroStructPy/compare/v1.2.2...v1.3.0

docs/source/cli/material.rst

@@ -521,13 +521,13 @@ coordinates while the second has a coupled distribution.
                 <scale> 1 </scale>
             </size>
             <position>  <!-- x -->
-                <dist_type> binom </dist>
+                <dist_type> binom </dist_type>
                 <loc> 0.5 </loc>
                 <n> 9 </n>
                 <p> 0.5 </p>
             </position>
             <position> <!-- y -->
-                <dist_type> uniform </dist>
+                <dist_type> uniform </dist_type>
                 <loc> 0 </loc>
                 <scale> 10 </scale>
             </position>

src/microstructpy/__init__.py

@@ -4,4 +4,4 @@
 import microstructpy.seeding
 import microstructpy.verification
 
-__version__ = '1.3.2'
+__version__ = '1.3.3'

src/microstructpy/cli.py

@@ -1015,42 +1015,37 @@ def dict_convert(dictionary, filepath='.'):
     .. _xmltodict: https://github.com/martinblech/xmltodict
     """
 
-    if type(dictionary) is list:
+    # Convert lists
+    if isinstance(dictionary, list):
         return [dict_convert(d) for d in dictionary]
 
-    new_dict = collections.OrderedDict()
-    for key in dictionary:
-        val = dictionary[key]
-        if type(val) in (dict, collections.OrderedDict):
-            new_val = dict_convert(val, filepath)
+    # Convert strings
+    if isinstance(dictionary, str):
+        return _misc.from_str(dictionary)
 
-            # Exception for scipy.stats distributions
-            if 'dist_type' in val:
-                new_val = _dist_convert(new_val)
+    # Convert Nones
+    if dictionary is None:
+        return {}
 
-        elif type(val) is list:
-            if type(val[0]) is str:
-                new_val = [_misc.from_str(v) for v in val]
-            else:
-                new_val = dict_convert(val, filepath)
-
-        elif val is None:
-            new_val = {}
-
-        # Exception for filepaths
-        elif any([s in key.lower() for s in ('filename', 'directory')]):
+    # Convert filepaths
+    for key in dictionary:
+        val = dictionary[key]
+        if any([s in key.lower() for s in ('filename', 'directory')]):
             if not os.path.isabs(val) and filepath:
                 new_val = os.path.abspath(os.path.join(filepath, val))
             else:
                 new_val = val
+            dictionary[key] = new_val
 
-        elif type(val) is str:
-            new_val = _misc.from_str(val)
-
-        else:
-            err_str = 'Cannot parse type for: ' + str(type(val))
-            raise ValueError(err_str)
+    # Convert SciPy.stats distributions
+    if 'dist_type' in dictionary:
+        return _dist_convert(dictionary)
 
+    # Convert Dictionaries
+    new_dict = collections.OrderedDict()
+    for key in dictionary:
+        val = dictionary[key]
+        new_val = dict_convert(val, filepath)
         new_dict[key] = new_val
     return new_dict
 
@@ -1059,7 +1054,8 @@ def _dist_convert(dist_dict):
     """Convert distribution dictionary to distribution"""
 
     dist_type = dist_dict['dist_type'].strip().lower()
-    params = {k: v for k, v in dist_dict.items() if k != 'dist_type'}
+    params = {k: _misc.from_str(v) for k, v in dist_dict.items()}
+    del params['dist_type']
 
     if dist_type == 'cdf':
         cdf_filename = params['filename']