Added new shape families for Archimedean, Catalan, Johnson, and other solids.

Credits.rst

@@ -105,8 +105,13 @@ Tobias Dwyer
 * Added examples for the shape classes.
 
 Jen Bradley
+
 * Bug fixes for ``gsd_shape_spec`` to correctly comply with GSD specifications.
 * Fixed error where ``__repr__`` would fail for polyhedra with multiple face types.
+* Increased accuracy of stored data for PlatonicFamily solids
+* Added shape families for Archimedean, Catalan, and Johnson solids.
+* Added shape family for prisms and antiprisms.
+* Added shape family for equilateral pyramids and dipyramids.
 
 Source code
 -----------

coxeter/families/__init__.py

@@ -17,7 +17,15 @@
 reproducing the exact set of shapes from publications.
 """
 
-from .common import PlatonicFamily, RegularNGonFamily
+from .common import (
+    ArchimedeanFamily,
+    CatalanFamily,
+    JohnsonFamily,
+    PlatonicFamily,
+    PrismAntiprismFamily,
+    PyramidDipyramidFamily,
+    RegularNGonFamily,
+)
 from .doi_data_repositories import _doi_shape_collection_factory, _KeyedDefaultDict
 from .plane_shape_families import (
     Family323Plus,
@@ -53,6 +61,11 @@
     "Family423",
     "Family523",
     "PlatonicFamily",
+    "ArchimedeanFamily",
+    "CatalanFamily",
+    "JohnsonFamily",
+    "PrismAntiprismFamily",
+    "PyramidDipyramidFamily",
     "RegularNGonFamily",
     "ShapeFamily",
     "TabulatedShapeFamily",

coxeter/families/common.py

@@ -83,3 +83,74 @@ def make_vertices(cls, n):
             "Icosahedron", "Octahedron", and "Tetrahedron".
 """,
 )
+
+ArchimedeanFamily = TabulatedGSDShapeFamily.from_json_file(
+    os.path.join(_DATA_FOLDER, "archimedean.json"),
+    classname="ArchimedeanFamily",
+    docstring="""The family of Archimedean solids (13 total).
+The following parameters are required by this class:
+    - name: The name of the ArchimedeanFamily solid. Options are "Cuboctahedron", \
+            "Icosidodecahedron", "Truncated Tetrahedron", "Truncated Octahedron", \
+            "Truncated Cube", "Truncated Icosahedron", "Truncated Dodecahedron", \
+            "Rhombicuboctahedron", "Rhombicosidodecahedron", "Truncated \
+            Cuboctahedron", "Truncated Icosidodecahedron", "Snub Cuboctahedron", \
+            and "Snub Icosidodecahedron".
+""",
+)
+
+CatalanFamily = TabulatedGSDShapeFamily.from_json_file(
+    os.path.join(_DATA_FOLDER, "catalan.json"),
+    classname="CatalanFamily",
+    docstring="""The family of Catalan solids, also known as Archimedean duals
+    (13 total).
+The following parameters are required by this class:
+    - name: The name of the CatalanFamily solid. Options are "Deltoidal  \
+            Hexecontahedron", "DeltoidalIcositetrahedron", "Disdyakis \
+            Dodecahedron", "Disdyakis Triacontahedron", "Pentagonal \
+            Hexecontahedron", "Pentagonal Icositetrahedron", "Pentakis \
+            Dodecahedron", "Rhombic Dodecahedron", "Rhombic \
+            Triacontahedron", "Triakis Octahedron", "Tetrakis \
+            Hexahedron", "Triakis Icosahedron", and "Triakis Tetrahedron".
+""",
+)
+
+JohnsonFamily = TabulatedGSDShapeFamily.from_json_file(
+    os.path.join(_DATA_FOLDER, "johnson.json"),
+    classname="JohnsonFamily",
+    docstring="""The family of Johnson solids (92 total).
+The following parameters are required by this class:
+    - name: The name of the JohnsonFamily solid. A full list is available in \
+            10.1126/science.1220869: :cite:`Damasceno2012`. In general, shape names \
+            should have the first character of each word capitalized, with spaces \
+            between words (e.g. "Elongated Triangular Cupola"). Pyramids and \
+            dipyramids are named from their base polygon (e.g. "Square Pyramid" \
+            or "Elongated Pentagonal Dipyramid").
+""",
+)
+
+
+PyramidDipyramidFamily = TabulatedGSDShapeFamily.from_json_file(
+    os.path.join(_DATA_FOLDER, "pyramid_dipyramid.json"),
+    classname="PyramidDipyramidFamily",
+    docstring="""The family of regular equilateral pyramids and dipyramids (6 total).
+The following parameters are required by this class:
+    - name: The name of the pyramid or dipyramid. Options are "Triangular Pyramid", \
+            "Square Pyramid", "Pentagonal Pyramid", "Triangular Dipyramid", \
+            "Square Dipyramid", and "Pentagonal Dipyramid".
+""",
+)
+
+PrismAntiprismFamily = TabulatedGSDShapeFamily.from_json_file(
+    os.path.join(_DATA_FOLDER, "prism_antiprism.json"),
+    classname="PrismAntiprismFamily",
+    docstring="""The family of n-gonal prisms and antiprisms with n∈[3,10] (16 total).
+The following parameters are required by this class:
+    - name: The name of the prism or antiprism. Options for prisms are  \
+            "Triangular Prism", "Square Prism", "Pentagonal Prism", "Hexagonal Prism", \
+            "Heptagonal Prism", "Octagonal Prism", "Nonagonal Prism", and \
+            "Decagonal Prism". Options for antiprisms are "Triangular Antiprism", \
+            "Square Antiprism", "Pentagonal Antiprism", "Hexagonal Antiprism", \
+            "Heptagonal Antiprism", "Octagonal Antiprism","Nonagonal Antiprism", \
+            and "Decagonal Antiprism".
+""",
+)