Restructure validators so that Disposition objects have their own distinct validator

Author: PhilMiller

src/penn_chime/parameters.py

@@ -9,7 +9,7 @@
 from typing import Optional
 
 from .validators import (
-    Positive, OptionalStrictlyPositive, StrictlyPositive, Rate, Date, OptionalDate
+    Positive, OptionalStrictlyPositive, StrictlyPositive, Rate, Date, OptionalDate, ValDisposition
     )
 
 # Parameters for each disposition (hospitalized, icu, ventilated)
@@ -69,9 +69,9 @@ def __init__(
         region: Optional[Regions] = None,
     ):
         self.current_hospitalized = Positive(value=current_hospitalized)
-        Rate(value=hospitalized.rate), Rate(value=icu.rate), Rate(value=ventilated.rate)
-        StrictlyPositive(value=hospitalized.days), StrictlyPositive(value=icu.days),
-        StrictlyPositive(value=ventilated.days)
+        ValDisposition(value=hospitalized)
+        ValDisposition(value=icu)
+        ValDisposition(value=ventilated)
 
         self.hospitalized = hospitalized
         self.icu = icu

src/penn_chime/validators/__init__.py

@@ -1,14 +1,13 @@
 """the callable validator design pattern"""
 
-from .validators import Bounded, OptionalBounded, Rate, Date, OptionalDate
-
-EPSILON = 1.e-7
+from .validators import EPSILON, Bounded, OptionalBounded, Rate, Date, OptionalDate, ValDisposition
 
 OptionalStrictlyPositive = OptionalBounded(lower_bound=EPSILON)
 StrictlyPositive = Bounded(lower_bound=EPSILON)
 Positive = Bounded(lower_bound=-EPSILON)
 Rate = Rate()  # type: ignore
 Date = Date()  # type: ignore
 OptionalDate = OptionalDate()  # type: ignore
+ValDisposition = ValDisposition()
 # # rolling a custom validator for doubling time in case DS wants to add upper bound
 # DoublingTime = OptionalBounded(lower_bound=0-EPSILON, upper_bound=None)

src/penn_chime/validators/validators.py

@@ -5,6 +5,7 @@
 
 from .base import Validator
 
+EPSILON = 1.e-7
 
 class Bounded(Validator):
     """A bounded number."""
@@ -67,3 +68,11 @@ def validate(self, value):
         if value is None:
             return None
         super().validate(value)
+
+class ValDisposition(Validator):
+    def __init__(self) -> None:
+        pass
+
+    def validate(self, value):
+        Bounded(lower_bound=EPSILON)(value=value.days)
+        Rate()(value=value.rate)