From 838f6c1c96413a54c548fdc96dfc552e57000745 Mon Sep 17 00:00:00 2001
From: "Sameer A." <saal@uw.edu>
Date: Fri, 19 Apr 2024 11:57:37 -0700
Subject: [PATCH] Solved lint errors

Updated innit for easier calling
Commented out unused functions but kept them incase I am missing use case
Need to write test for split_datapoint
Returned object for split_rate_jacobian but unsure if this is correct
---
 src/pydisagg/DisaggModel.py         |  3 +++
 src/pydisagg/__init__.py            | 27 +++++++++++++++++++--------
 src/pydisagg/age_split/__init__.py  |  6 ++++++
 src/pydisagg/age_split/age_split.py |  6 +++---
 tests/test_splitting_consistency.py |  4 +++-
 5 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/src/pydisagg/DisaggModel.py b/src/pydisagg/DisaggModel.py
index 213a9d2..85b70ce 100755
--- a/src/pydisagg/DisaggModel.py
+++ b/src/pydisagg/DisaggModel.py
@@ -737,3 +737,6 @@ def rate_split_full_jac(
         """
         beta = self.fit_beta(observed_total, rate_pattern, bucket_populations)
         # denominator = self.T_diff(self.T_inverse(self.))
+        # Check if this is accomplishing what i think it is - SA 4/19
+        # previously not returning anything
+        return self.rate_jacobian(beta, rate_pattern, bucket_populations)
diff --git a/src/pydisagg/__init__.py b/src/pydisagg/__init__.py
index 66593b1..90f588f 100755
--- a/src/pydisagg/__init__.py
+++ b/src/pydisagg/__init__.py
@@ -1,9 +1,20 @@
-import pydisagg.DisaggModel
-import pydisagg.disaggregate
-import pydisagg.models
-import pydisagg.ParameterTransformation
-import pydisagg.preprocess
+# pydisagg/__init__.py
+from . import DisaggModel
+from . import disaggregate
+from . import models
+from . import ParameterTransformation
+from . import preprocess
+from .age_split import age_split
+from .age_split import age_var
+from .age_split import helper
 
-import pydisagg.age_split.age_split
-import pydisagg.age_split.age_var
-import pydisagg.age_split.helper
+__all__ = [
+    "DisaggModel",
+    "disaggregate",
+    "models",
+    "ParameterTransformation",
+    "preprocess",
+    "age_split",
+    "age_var",
+    "helper",
+]
diff --git a/src/pydisagg/age_split/__init__.py b/src/pydisagg/age_split/__init__.py
index e69de29..63345e8 100644
--- a/src/pydisagg/age_split/__init__.py
+++ b/src/pydisagg/age_split/__init__.py
@@ -0,0 +1,6 @@
+# age_split/__init__.py
+from . import age_split
+from . import age_var
+from . import helper
+
+__all__ = ["age_split", "age_var", "helper"]
\ No newline at end of file
diff --git a/src/pydisagg/age_split/age_split.py b/src/pydisagg/age_split/age_split.py
index 29cc251..f61d369 100755
--- a/src/pydisagg/age_split/age_split.py
+++ b/src/pydisagg/age_split/age_split.py
@@ -133,12 +133,12 @@ def split_row(
     split_results = [
         split_result_df[
             split_result_df["age_val"].between(
-                max(l, row["original_data_age_start"]),
-                min(u, row["original_data_age_end"]),
+                max(low, row["original_data_age_start"]),
+                min(up, row["original_data_age_end"]),
                 inclusive="left",
             )
         ]
-        for l, u in zip(
+        for low, up in zip(
             output_subset["age_group_years_start"], output_subset["age_group_years_end"]
         )
     ]
diff --git a/tests/test_splitting_consistency.py b/tests/test_splitting_consistency.py
index 1f4c56b..bae5bfe 100644
--- a/tests/test_splitting_consistency.py
+++ b/tests/test_splitting_consistency.py
@@ -3,9 +3,11 @@
 from numpy.testing import assert_approx_equal
 
 from pydisagg import models
-from pydisagg.disaggregate import split_datapoint
 from pydisagg.DisaggModel import DisaggModel
 
+# Need to test
+#from pydisagg.disaggregate import split_datapoint
+
 model_list = [
     models.RateMultiplicativeModel(),
     models.LogOdds_model(),