Skip to content

Commit

Permalink
sort imports
Browse files Browse the repository at this point in the history
  • Loading branch information
zhengp0 committed Mar 27, 2024
1 parent 73b4a4b commit 4b6abf9
Show file tree
Hide file tree
Showing 14 changed files with 23 additions and 15 deletions.
7 changes: 4 additions & 3 deletions src/regmod/_typing.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from typing import Any, Callable
from collections.abc import Iterable
from numpy.typing import ArrayLike, NDArray
from pandas import DataFrame
from typing import Any, Callable

from jax import Array as JaxArray
from msca.linalg.matrix import Matrix
from numpy.typing import ArrayLike, NDArray
from pandas import DataFrame
3 changes: 2 additions & 1 deletion src/regmod/function.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
"""

from dataclasses import dataclass, field
from regmod._typing import Callable

import numpy as np

from regmod._typing import Callable


@dataclass
class SmoothFunction:
Expand Down
2 changes: 1 addition & 1 deletion src/regmod/models/binomial.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import numpy as np
from scipy.stats import binom

from regmod._typing import Callable, DataFrame, NDArray
from regmod.optimizer import msca_optimize
from regmod._typing import Callable, NDArray, DataFrame

from .model import Model
from .utils import model_post_init
Expand Down
2 changes: 1 addition & 1 deletion src/regmod/models/gaussian.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import numpy as np
from scipy.stats import norm

from regmod._typing import Callable, DataFrame, NDArray
from regmod.optimizer import msca_optimize
from regmod._typing import Callable, NDArray, DataFrame

from .model import Model
from .utils import model_post_init
Expand Down
2 changes: 1 addition & 1 deletion src/regmod/models/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
from scipy.linalg import block_diag
from scipy.sparse import csc_matrix

from regmod._typing import Callable, DataFrame, Matrix, NDArray
from regmod.optimizer import scipy_optimize
from regmod.parameter import Parameter
from regmod.utils import sizes_to_slices
from regmod._typing import Callable, NDArray, DataFrame, Matrix


class Model:
Expand Down
3 changes: 2 additions & 1 deletion src/regmod/models/negativebinomial.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
from scipy.special import digamma, loggamma, polygamma
from scipy.stats import nbinom

from regmod._typing import NDArray, DataFrame
from regmod._typing import DataFrame, NDArray

from .model import Model


Expand Down
3 changes: 2 additions & 1 deletion src/regmod/models/pogit.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
import numpy as np
from scipy.stats import poisson

from regmod._typing import NDArray, DataFrame
from regmod._typing import DataFrame, NDArray

from .model import Model


Expand Down
3 changes: 2 additions & 1 deletion src/regmod/models/poisson.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
import numpy as np
from scipy.stats import poisson

from regmod._typing import Callable, DataFrame, NDArray
from regmod.optimizer import msca_optimize
from regmod._typing import Callable, NDArray, DataFrame

from .model import Model
from .utils import model_post_init

Expand Down
2 changes: 1 addition & 1 deletion src/regmod/models/tobit.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
from jax import grad, hessian, jit, lax
from jax.scipy.stats.norm import logcdf, logpdf

from regmod.function import SmoothFunction
from regmod._typing import ArrayLike, DataFrame, JaxArray
from regmod.function import SmoothFunction

from .model import Model

Expand Down
3 changes: 2 additions & 1 deletion src/regmod/models/utils.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import numpy as np
from msca.linalg.matrix import asmatrix
from scipy.sparse import csc_matrix
from regmod._typing import NDArray, Matrix

from regmod._typing import Matrix, NDArray


def model_post_init(
Expand Down
3 changes: 2 additions & 1 deletion src/regmod/models/weibull.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
import numpy as np
from scipy.stats import weibull_min

from regmod._typing import NDArray, DataFrame
from regmod._typing import DataFrame, NDArray

from .model import Model


Expand Down
1 change: 1 addition & 0 deletions src/regmod/optimizer.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from msca.optim.prox import proj_capped_simplex
from msca.optim.solver import IPSolver, NTSolver
from scipy.optimize import LinearConstraint, minimize

from regmod._typing import Callable, NDArray


Expand Down
2 changes: 1 addition & 1 deletion src/regmod/parameter.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
import numpy as np
from scipy.linalg import block_diag

from regmod._typing import DataFrame, NDArray
from regmod.function import SmoothFunction, fun_dict
from regmod.prior import LinearGaussianPrior, LinearUniformPrior
from regmod.variable import SplineVariable, Variable
from regmod._typing import NDArray, DataFrame


@dataclass
Expand Down
2 changes: 1 addition & 1 deletion src/regmod/variable.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import numpy as np
from xspline import XSpline

from regmod._typing import DataFrame, Iterable, NDArray
from regmod.prior import (
GaussianPrior,
LinearGaussianPrior,
Expand All @@ -20,7 +21,6 @@
UniformPrior,
)
from regmod.utils import SplineSpecs
from regmod._typing import Iterable, NDArray, DataFrame


@dataclass
Expand Down

0 comments on commit 4b6abf9

Please sign in to comment.