Fix notebooks for CentroidType/DType usage.

AttributeDef now checks its type definition for acceptability.
Regen geos so they load with proper types in AttributeDef.

doc/devlog/2023-07-06.ipynb

@@ -25,7 +25,7 @@
     "import numpy as np\n",
     "\n",
     "from epymorph.data_shape import Shapes\n",
-    "from epymorph.data_type import CentroidDType\n",
+    "from epymorph.data_type import CentroidDType, CentroidType\n",
     "from epymorph.geo.spec import StaticGeoSpec, Year\n",
     "from epymorph.geography.us_census import StateScope\n",
     "from epymorph.simulation import AttributeDef\n",
@@ -34,7 +34,7 @@
     "    attributes=[\n",
     "        AttributeDef('label', str, Shapes.N),\n",
     "        AttributeDef('geoid', str, Shapes.N),\n",
-    "        AttributeDef('centroid', CentroidDType, Shapes.N),\n",
+    "        AttributeDef('centroid', CentroidType, Shapes.N),\n",
     "        AttributeDef('population', int, Shapes.N),\n",
     "        AttributeDef('commuters', int, Shapes.NxN),\n",
     "        AttributeDef('humidity', float, Shapes.TxN),\n",

doc/devlog/2023-07-07.ipynb

@@ -27,7 +27,7 @@
     "from census import Census\n",
     "\n",
     "from epymorph.data_shape import Shapes\n",
-    "from epymorph.data_type import CentroidDType\n",
+    "from epymorph.data_type import CentroidDType, CentroidType\n",
     "from epymorph.error import GeoValidationException\n",
     "from epymorph.geo.spec import LABEL, StaticGeoSpec, Year\n",
     "from epymorph.geo.static import StaticGeo\n",
@@ -47,7 +47,7 @@
     "    attributes=[\n",
     "        LABEL,\n",
     "        AttributeDef('geoid', str, Shapes.N),\n",
-    "        AttributeDef('centroid', CentroidDType, Shapes.N),\n",
+    "        AttributeDef('centroid', CentroidType, Shapes.N),\n",
     "        AttributeDef('population', int, Shapes.N),\n",
     "        AttributeDef('commuters', int, Shapes.NxN),\n",
     "    ],\n",
@@ -211,7 +211,7 @@
     {
      "data": {
       "text/plain": [
-       "<epymorph.geo.static.StaticGeo at 0x7f0c8a6dc390>"
+       "<epymorph.geo.static.StaticGeo at 0x745351b80690>"
       ]
      },
      "execution_count": 6,
@@ -311,7 +311,7 @@
     {
      "data": {
       "text/plain": [
-       "<epymorph.geo.static.StaticGeo at 0x7f0c8f1db850>"
+       "<epymorph.geo.static.StaticGeo at 0x74534ac419d0>"
       ]
      },
      "execution_count": 10,

doc/devlog/2023-07-12.ipynb

@@ -24,7 +24,7 @@
     "from census import Census\n",
     "\n",
     "from epymorph.data_shape import Shapes\n",
-    "from epymorph.data_type import CentroidDType\n",
+    "from epymorph.data_type import CentroidDType, CentroidType\n",
     "from epymorph.error import GeoValidationException\n",
     "from epymorph.geo.spec import LABEL, StaticGeoSpec, Year\n",
     "from epymorph.geo.static import StaticGeo\n",
@@ -39,7 +39,7 @@
     "attributes: list[AttributeDef] = [\n",
     "    LABEL,\n",
     "    AttributeDef('geoid', str, Shapes.N),\n",
-    "    AttributeDef('centroid', CentroidDType, Shapes.N),\n",
+    "    AttributeDef('centroid', CentroidType, Shapes.N),\n",
     "    AttributeDef('population', int, Shapes.N),\n",
     "    # AttributeDef('population_by_age', int, Shapes.NxA(3)),\n",
     "    # AttributeDef('population_by_age_x6', int, Shapes.NxA(6)),\n",

doc/devlog/2024-03-19.ipynb

@@ -16,7 +16,7 @@
    "outputs": [],
    "source": [
     "from epymorph.data_shape import Shapes\n",
-    "from epymorph.data_type import CentroidDType\n",
+    "from epymorph.data_type import CentroidType\n",
     "from epymorph.geo.spec import DynamicGeoSpec, Year\n",
     "from epymorph.geography.us_census import CountyScope\n",
     "from epymorph.simulation import AttributeDef\n",
@@ -26,7 +26,7 @@
     "        AttributeDef('label', type=str, shape=Shapes.N),\n",
     "        AttributeDef('population', type=int, shape=Shapes.N),\n",
     "        # AttributeDef('population_by_age', dtype=int, shape=Shapes.NxA(3)),\n",
-    "        AttributeDef('centroid', type=CentroidDType, shape=Shapes.N),\n",
+    "        AttributeDef('centroid', type=CentroidType, shape=Shapes.N),\n",
     "        AttributeDef('geoid', type=str, shape=Shapes.N),\n",
     "        AttributeDef('dissimilarity_index', type=float, shape=Shapes.N),\n",
     "        AttributeDef('median_income', type=int, shape=Shapes.N),\n",
@@ -62,6 +62,7 @@
     "# Test that we can load this geo back successfully...\n",
     "\n",
     "from typing import cast\n",
+    "\n",
     "from epymorph import geo_library\n",
     "from epymorph.error import GeoValidationException\n",
     "from epymorph.geo.dynamic import DynamicGeo\n",

doc/devlog/2024-06-03.ipynb

@@ -20,7 +20,7 @@
    "outputs": [],
    "source": [
     "from epymorph.data_shape import Shapes\n",
-    "from epymorph.data_type import CentroidDType\n",
+    "from epymorph.data_type import CentroidType\n",
     "from epymorph.geo.adrio import adrio_maker_library\n",
     "from epymorph.geo.dynamic import DynamicGeo\n",
     "from epymorph.geo.spec import DynamicGeoSpec, Year\n",
@@ -33,7 +33,7 @@
     "        AttributeDef('population', int, Shapes.N),\n",
     "        # AttributeDef('population_by_age', int, Shapes.NxA(3)),\n",
     "        # AttributeDef('population_by_age_x6', int, Shapes.NxA(6)),\n",
-    "        AttributeDef('centroid', CentroidDType, Shapes.N),\n",
+    "        AttributeDef('centroid', CentroidType, Shapes.N),\n",
     "        AttributeDef('geoid', str, Shapes.N),\n",
     "        AttributeDef('average_household_size', int, Shapes.N),\n",
     "        AttributeDef('dissimilarity_index', float, Shapes.N),\n",
@@ -130,7 +130,7 @@
     "    AttributeDef('population', int, Shapes.N),\n",
     "    # AttributeDef('population_by_age', int, Shapes.NxA(3)),\n",
     "    # AttributeDef('population_by_age_x6', int, Shapes.NxA(6)),\n",
-    "    AttributeDef('centroid', CentroidDType, Shapes.N),\n",
+    "    AttributeDef('centroid', CentroidType, Shapes.N),\n",
     "    AttributeDef('geoid', str, Shapes.N),\n",
     "    AttributeDef('average_household_size', int, Shapes.N),\n",
     "    AttributeDef('dissimilarity_index', float, Shapes.N),\n",
@@ -168,7 +168,7 @@
     "    AttributeDef('population', int, Shapes.N),\n",
     "    # AttributeDef('population_by_age', int, Shapes.NxA(3)),\n",
     "    # AttributeDef('population_by_age_x6', int, Shapes.NxA(6)),\n",
-    "    AttributeDef('centroid', CentroidDType, Shapes.N),\n",
+    "    AttributeDef('centroid', CentroidType, Shapes.N),\n",
     "    AttributeDef('geoid', str, Shapes.N),\n",
     "    AttributeDef('average_household_size', int, Shapes.N),\n",
     "    AttributeDef('gini_index', float, Shapes.N),\n",

doc/devlog/2024-07-10.ipynb

@@ -17,24 +17,27 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 18,
+   "execution_count": 1,
    "metadata": {},
    "outputs": [],
    "source": [
     "from epymorph.data_shape import Shapes\n",
-    "from epymorph.data_type import CentroidDType\n",
+    "from epymorph.data_type import CentroidDType, CentroidType\n",
     "from epymorph.geo.adrio.census.adrio_census import ADRIOMakerCensus\n",
     "from epymorph.geo.spec import Year\n",
     "from epymorph.geography.us_census import CountyScope\n",
-    "from epymorph.simulation import geo_attrib\n",
+    "from epymorph.simulation import AttributeDef\n",
     "\n",
     "# make adrios for one attribute from each fetch method\n",
     "maker = ADRIOMakerCensus()\n",
     "geoids = ['04001', '04003', '04005', '04013', '04017']\n",
     "scope = CountyScope.in_counties(geoids)\n",
     "time_period = Year(2020)\n",
-    "attribs = [geo_attrib('population', int, Shapes.N), geo_attrib(\n",
-    "    'centroid', CentroidDType, Shapes.N), geo_attrib('commuters', int, Shapes.NxN)]\n",
+    "attribs = [\n",
+    "    AttributeDef('population', int, Shapes.N),\n",
+    "    AttributeDef('centroid', CentroidType, Shapes.N),\n",
+    "    AttributeDef('commuters', int, Shapes.NxN),\n",
+    "]\n",
     "\n",
     "population = maker.make_adrio(attribs[0], scope, time_period)\n",
     "centroid = maker.make_adrio(attribs[1], scope, time_period)\n",
@@ -43,7 +46,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 17,
+   "execution_count": 2,
    "metadata": {},
    "outputs": [
     {
@@ -59,15 +62,27 @@
    "source": [
     "import numpy as np\n",
     "\n",
-    "from epymorph.util import check_ndarray\n",
+    "from epymorph.util import check_ndarray, match\n",
+    "\n",
+    "T = time_period.days\n",
+    "N = len(population.get_value())\n",
     "\n",
     "# validate datatype and shape\n",
-    "check_ndarray(population.get_value(), dtype=[int], shape=attribs[0].shape.as_tuple(\n",
-    "    len(population.get_value()), time_period.days))\n",
-    "check_ndarray(centroid.get_value(), dtype=[CentroidDType], shape=attribs[1].shape.as_tuple(\n",
-    "    len(population.get_value()), time_period.days))\n",
-    "check_ndarray(commuters.get_value(), dtype=[int], shape=attribs[2].shape.as_tuple(\n",
-    "    len(population.get_value()), time_period.days))\n",
+    "check_ndarray(\n",
+    "    population.get_value(),\n",
+    "    dtype=match.dtype(int),\n",
+    "    shape=match.shape_literal((N,))\n",
+    ")\n",
+    "check_ndarray(\n",
+    "    centroid.get_value(),\n",
+    "    dtype=match.dtype(CentroidDType),\n",
+    "    shape=match.shape_literal((N,))\n",
+    ")\n",
+    "check_ndarray(\n",
+    "    commuters.get_value(),\n",
+    "    dtype=match.dtype(int),\n",
+    "    shape=match.shape_literal((N, N))\n",
+    ")\n",
     "\n",
     "# values retrieved manually from Census table B01001\n",
     "population_array = [71714, 126442, 142254, 4412779, 110271]\n",
@@ -104,12 +119,13 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 3,
    "metadata": {},
    "outputs": [],
    "source": [
     "from io import BytesIO\n",
     "from urllib.request import urlopen\n",
+    "\n",
     "from geopandas import read_file\n",
     "\n",
     "# load in shapefile data for use in centroid caclulations\n",
@@ -126,7 +142,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 4,
    "metadata": {},
    "outputs": [
     {
@@ -145,7 +161,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 5,
    "metadata": {},
    "outputs": [
     {

epymorph/data/geo/us_sw_counties_2015.geo

@@ -1 +1 @@
-{"py/object": "epymorph.geo.spec.DynamicGeoSpec", "py/state": {"attributes": [{"py/object": "epymorph.simulation.AttributeDef", "name": "label", "type": {"py/type": "builtins.str"}, "shape": {"py/object": "epymorph.data_shape.Node"}, "default_value": null, "comment": null}, {"py/object": "epymorph.simulation.AttributeDef", "name": "population", "type": {"py/type": "builtins.int"}, "shape": {"py/id": 4}, "default_value": null, "comment": null}, {"py/object": "epymorph.simulation.AttributeDef", "name": "centroid", "type": [{"py/tuple": ["longitude", {"py/type": "builtins.float"}]}, {"py/tuple": ["latitude", {"py/type": "builtins.float"}]}], "shape": {"py/id": 4}, "default_value": null, "comment": null}, {"py/object": "epymorph.simulation.AttributeDef", "name": "geoid", "type": {"py/type": "builtins.str"}, "shape": {"py/id": 4}, "default_value": null, "comment": null}, {"py/object": "epymorph.simulation.AttributeDef", "name": "dissimilarity_index", "type": {"py/type": "builtins.float"}, "shape": {"py/id": 4}, "default_value": null, "comment": null}, {"py/object": "epymorph.simulation.AttributeDef", "name": "median_income", "type": {"py/type": "builtins.int"}, "shape": {"py/id": 4}, "default_value": null, "comment": null}, {"py/object": "epymorph.simulation.AttributeDef", "name": "pop_density_km2", "type": {"py/type": "builtins.float"}, "shape": {"py/id": 4}, "default_value": null, "comment": null}, {"py/object": "epymorph.simulation.AttributeDef", "name": "commuters", "type": {"py/type": "builtins.int"}, "shape": {"py/object": "epymorph.data_shape.NodeAndNode"}, "default_value": null, "comment": null}], "time_period": {"py/object": "epymorph.geo.spec.Year", "year": 2015, "days": 365, "start_date": {"py/object": "datetime.date", "__reduce__": [{"py/type": "datetime.date"}, ["B98BAQ=="]]}, "end_date": {"py/object": "datetime.date", "__reduce__": [{"py/type": "datetime.date"}, ["B+ABAQ=="]]}}, "scope": {"py/object": "epymorph.geography.us_census.CountyScope", "year": 2010, "includes_granularity": "state", "includes": ["04", "08", "49", "35", "32"]}, "source": {"label": "Census:name", "population": "Census", "centroid": "Census", "geoid": "Census", "dissimilarity_index": "Census", "median_income": "Census", "pop_density_km2": "Census", "commuters": "Census"}}}
+{"py/object": "epymorph.geo.spec.DynamicGeoSpec", "py/state": {"attributes": [{"py/object": "epymorph.simulation.AttributeDef", "name": "label", "type": {"py/type": "builtins.str"}, "shape": {"py/object": "epymorph.data_shape.Node"}, "default_value": null, "comment": null}, {"py/object": "epymorph.simulation.AttributeDef", "name": "population", "type": {"py/type": "builtins.int"}, "shape": {"py/id": 4}, "default_value": null, "comment": null}, {"py/object": "epymorph.simulation.AttributeDef", "name": "centroid", "type": [{"py/tuple": ["longitude", {"py/type": "builtins.float"}]}, {"py/tuple": ["latitude", {"py/type": "builtins.float"}]}], "shape": {"py/id": 4}, "default_value": null, "comment": null}, {"py/object": "epymorph.simulation.AttributeDef", "name": "geoid", "type": {"py/type": "builtins.str"}, "shape": {"py/id": 4}, "default_value": null, "comment": null}, {"py/object": "epymorph.simulation.AttributeDef", "name": "dissimilarity_index", "type": {"py/type": "builtins.float"}, "shape": {"py/id": 4}, "default_value": null, "comment": null}, {"py/object": "epymorph.simulation.AttributeDef", "name": "median_income", "type": {"py/type": "builtins.int"}, "shape": {"py/id": 4}, "default_value": null, "comment": null}, {"py/object": "epymorph.simulation.AttributeDef", "name": "pop_density_km2", "type": {"py/type": "builtins.float"}, "shape": {"py/id": 4}, "default_value": null, "comment": null}, {"py/object": "epymorph.simulation.AttributeDef", "name": "commuters", "type": {"py/type": "builtins.int"}, "shape": {"py/object": "epymorph.data_shape.NodeAndNode"}, "default_value": null, "comment": null}], "scope": {"py/object": "epymorph.geography.us_census.CountyScope", "year": 2010, "includes_granularity": "state", "includes": ["04", "08", "49", "35", "32"]}, "time_period": {"py/object": "epymorph.geo.spec.Year", "year": 2015, "days": 365, "start_date": {"py/object": "datetime.date", "__reduce__": [{"py/type": "datetime.date"}, ["B98BAQ=="]]}, "end_date": {"py/object": "datetime.date", "__reduce__": [{"py/type": "datetime.date"}, ["B+ABAQ=="]]}}, "source": {"label": "Census:name", "population": "Census", "centroid": "Census", "geoid": "Census", "dissimilarity_index": "Census", "median_income": "Census", "pop_density_km2": "Census", "commuters": "Census"}}}

epymorph/data_type.py

@@ -97,7 +97,7 @@ def dtype_check(dtype: AttributeType, value: Any) -> bool:
 CentroidType: AttributeType = [('longitude', float), ('latitude', float)]
 """Structured epymorph type declaration for long/lat coordinates."""
 CentroidDType: DTypeLike = [('longitude', np.float64), ('latitude', np.float64)]
-"""Structured numpy dtype for long/lat coordinates."""
+"""The numpy equivalent of `CentroidType` (structured dtype for long/lat coordinates)."""
 
 # SimDType being centrally-located means we can change it reliably.
 SimDType = np.int64

epymorph/simulation.py

@@ -141,6 +141,12 @@ class AttributeKey(Generic[AttributeT]):
     shape: DataShape
 
     def __post_init__(self):
+        try:
+            dtype_as_np(self.type)
+        except Exception as e:
+            msg = f"AttributeDef's type is not correctly specified: {self.type}\n" \
+                + "See documentation for appropriate type designations."
+            raise ValueError(msg) from e
         object.__setattr__(self, 'attribute_name', AttributeName(self.name))
 
     @overload
@@ -168,6 +174,12 @@ class AttributeDef(AttributeKey[AttributeT]):
     comment: str | None = field(default=None, compare=False)
 
     def __post_init__(self):
+        try:
+            dtype_as_np(self.type)
+        except Exception as e:
+            msg = f"AttributeDef's type is not correctly specified: {self.type}\n" \
+                + "See documentation for appropriate type designations."
+            raise ValueError(msg) from e
         if self.default_value is not None and not dtype_check(self.type, self.default_value):
             msg = "AttributeDef's default value does not align with its dtype."
             raise ValueError(msg)

epymorph/util.py

@@ -376,6 +376,25 @@ def __call__(self, value: DTypeLike) -> bool:
         return any((np.can_cast(value, x, casting='safe') for x in self._acceptable))
 
 
+class MatchShapeLiteral(Matcher[NDArray]):
+    """
+    Matches a numpy array shape to a known literal value.
+    (For matching relative to simulation dimensions, you want DataShapeMatcher.)
+    """
+
+    _acceptable: tuple[int, ...]
+
+    def __init__(self, acceptable: tuple[int, ...]):
+        self._acceptable = acceptable
+
+    def expected(self) -> str:
+        """Describes what the expected value is."""
+        return str(self._acceptable)
+
+    def __call__(self, value: NDArray) -> bool:
+        return self._acceptable == value.shape
+
+
 @dataclass(frozen=True)
 class _Matchers:
     """Convenience constructors for various matchers."""
@@ -399,6 +418,10 @@ def dtype_cast(self, *dtypes: DTypeLike) -> Matcher[DTypeLike]:
         """Creates a MatchDTypeCast instance."""
         return MatchDTypeCast(*dtypes)
 
+    def shape_literal(self, shape: tuple[int, ...]) -> Matcher[NDArray]:
+        """Creates a MatchShapeLiteral instance."""
+        return MatchShapeLiteral(shape)
+
 
 match = _Matchers()
 """Convenience constructors for various matchers."""