Renamed InputPopulationError to InputTableError for clarity as it can be raised if tours are being input

Author: JoeJimFlood

activitysim/abm/models/initialize_tours.py

@@ -10,8 +10,8 @@
 from activitysim.core import expressions, tracing, workflow
 from activitysim.core.configuration import PydanticReadable
 from activitysim.core.configuration.base import PreprocessorSettings
+from activitysim.core.exceptions import InputTableError
 from activitysim.core.input import read_input_table
-from activitysim.core.exceptions import InputPopulationError
 
 logger = logging.getLogger(__name__)
 
@@ -141,9 +141,7 @@ def initialize_tours(
             f"{tours_without_persons.sum()} tours out of {len(persons)} without persons\n"
             f"{pd.Series({'person_id': tours_without_persons.index.values})}"
         )
-        raise InputPopulationError(
-            f"{tours_without_persons.sum()} tours with bad person_id"
-        )
+        raise InputTableError(f"{tours_without_persons.sum()} tours with bad person_id")
 
     if trace_hh_id:
         state.tracing.trace_df(tours, label="initialize_tours", warn_if_empty=True)

activitysim/abm/tables/persons.py

@@ -9,8 +9,8 @@
 
 from activitysim.abm.tables.util import simple_table_join
 from activitysim.core import workflow
+from activitysim.core.exceptions import InputTableError
 from activitysim.core.input import read_input_table
-from activitysim.core.exceptions import InputPopulationError
 
 logger = logging.getLogger(__name__)
 
@@ -56,7 +56,7 @@ def persons(state: workflow.State) -> pd.DataFrame:
             f"{persons_without_households.sum()} persons out of {len(df)} without households\n"
             f"{pd.Series({'person_id': persons_without_households.index.values})}"
         )
-        raise InputPopulationError(
+        raise InputTableError(
             f"{persons_without_households.sum()} persons with bad household_id"
         )
 
@@ -68,7 +68,7 @@ def persons(state: workflow.State) -> pd.DataFrame:
             f"{households_without_persons.sum()} households out of {len(households.index)} without  persons\n"
             f"{pd.Series({'household_id': households_without_persons.index.values})}"
         )
-        raise InputPopulationError(
+        raise InputTableError(
             f"{households_without_persons.sum()} households with no persons"
         )
 
@@ -108,5 +108,5 @@ def persons_merged(
             left_on="person_id",
         )
     if n_persons != len(persons):
-        raise InputPopulationError("number of persons changed")
+        raise InputTableError("number of persons changed")
     return persons

activitysim/core/exceptions.py

@@ -74,7 +74,7 @@ class TableSlicingError(RuntimeError):
     """An error occurred trying to slice a table."""
 
 
-class InputPopulationError(RuntimeError):
+class InputTableError(RuntimeError):
     """An issue with the input population was found."""