Drop private _lcm.* imports in favour of public lcm.*

- `_common.py`: ContinuousGrid annotations replaced with concrete
  PiecewiseLinSpacedGrid (aime) and IrregSpacedGrid
  (consumption_dollars), matching the actual built types.
- test_initial_conditions_extreme_assets: import
  validate_initial_conditions through `lcm.model` instead of
  `_lcm.simulation.initial_conditions`.

Author: hmgaudecker

src/aca_model/baseline/regimes/_common.py

@@ -11,7 +11,6 @@
 
 import jax.numpy as jnp
 import numpy as np
-from _lcm.grids.continuous import ContinuousGrid
 from lcm import (
     DiscreteGrid,
     IrregSpacedGrid,
@@ -191,8 +190,8 @@ class RegimeSpec(TypedDict):
 @dataclass(frozen=True)
 class Grids:
     assets: LinSpacedGrid
-    aime: ContinuousGrid
-    consumption_dollars: ContinuousGrid
+    aime: PiecewiseLinSpacedGrid
+    consumption_dollars: IrregSpacedGrid
     wage_res: Any
     hcc_persistent: Any
     hcc_transitory: Any
@@ -298,7 +297,7 @@ def get_hcc_persistent_grid_points(*, grid_config: GridConfig) -> FloatND:
 
 def _build_aime_grid(
     *, grid_config: GridConfig, fixed_params: UserParams
-) -> ContinuousGrid:
+) -> PiecewiseLinSpacedGrid:
     """Return the AIME grid.
 
     The grid is piecewise-linspaced with breakpoints at the PIA bends

tests/test_initial_conditions_extreme_assets.py

@@ -8,7 +8,7 @@
 """
 
 import jax.numpy as jnp
-from _lcm.simulation.initial_conditions import validate_initial_conditions
+from lcm.model import validate_initial_conditions
 from lcm import DiscreteGrid
 
 from aca_model.agent.assets_and_income import borrowing_constraint