Skip to content

Commit

Permalink
Solved lint errors
Browse files Browse the repository at this point in the history
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
  • Loading branch information
saalUW committed Apr 19, 2024
1 parent 14ce469 commit 838f6c1
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 12 deletions.
3 changes: 3 additions & 0 deletions src/pydisagg/DisaggModel.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
27 changes: 19 additions & 8 deletions src/pydisagg/__init__.py
Original file line number Diff line number Diff line change
@@ -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",
]
6 changes: 6 additions & 0 deletions src/pydisagg/age_split/__init__.py
Original file line number Diff line number Diff line change
@@ -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"]
6 changes: 3 additions & 3 deletions src/pydisagg/age_split/age_split.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
)
]
Expand Down
4 changes: 3 additions & 1 deletion tests/test_splitting_consistency.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down

0 comments on commit 838f6c1

Please sign in to comment.