Skip to content

Fixing errors of NonStatGEV #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tausiaj merged 3 commits into from
Jul 25, 2025
Merged

Fixing errors of NonStatGEV #120

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b779cdf
[VCF] Fixing errors in NonStatGEV
viccollado Jul 22, 2025
3a7a827
Merge branch 'feature/extremes' of https://github.com/viccollado/Blue…
viccollado Jul 22, 2025
9e44dae
Merge branch 'GeoOcean:develop' into feature/extremes
viccollado Jul 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 27 additions & 19 deletions bluemath_tk/distributions/nonstat_gev.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2819,18 +2819,25 @@ def fit(
list_loc = []
if list_sc == "all":
list_sc = list(range(self.covariates.shape[1]))
elif list_loc is None:
list_loc = []
elif list_sc is None:
list_sc = []
if list_sh == "all":
list_sh = list(range(self.covariates.shape[1]))
elif list_loc is None:
list_loc = []
elif list_sh is None:
list_sh = []

self.nmu = nmu
self.npsi = npsi
self.ngamma = ngamma

self.list_loc = list_loc
self.nind_loc = len(list_loc)
self.ntrend_loc = ntrend_loc
self.list_sc = list_sc
self.nind_sc = len(list_sc)
self.ntrend_sc = ntrend_sc
self.list_sh = list_sh
self.nind_sh = len(list_sh)
self.ntrend_sh = ntrend_sh

fit_result = self._fit(
Expand Down Expand Up @@ -4497,7 +4504,7 @@ def _parametro(
m = len(t)

na, nind = covariates.shape
nparam = len(beta)
nparam = beta.size
# Chek if the number of parameters is even
if nparam % 2 != 0:
raise ValueError("Parameter number must be even")
Expand Down Expand Up @@ -5620,20 +5627,21 @@ def _Dmupsiepst(self) -> Tuple[np.ndarray, np.ndarray, np.ndarray]:

# Evaluate the parameters
mut1, psit1, epst = self._evaluate_params(
self.beta0,
self.beta,
self.alpha0,
self.alpha,
self.gamma0,
self.gamma,
self.betaT,
self.beta_cov,
self.alphaT,
self.alpha_cov,
self.gamma_cov,
self.covariates.iloc[:, self.list_loc].values,
self.covariates.iloc[:, self.list_sc].values,
self.covariates.iloc[:, self.list_sh].values,
beta0=self.beta0,
beta=self.beta,
betaT=self.betaT,
beta_cov=self.beta_cov,
alpha0=self.alpha0,
alpha=self.alpha,
alphaT=self.alphaT,
alpha_cov=self.alpha_cov,
gamma0=self.gamma0,
gamma=self.gamma,
gammaT=self.gammaT,
gamma_cov=self.gamma_cov,
covariates_loc=self.covariates.iloc[:, self.list_loc].values,
covariates_sc=self.covariates.iloc[:, self.list_sc].values,
covariates_sh=self.covariates.iloc[:, self.list_sh].values,
)

# The values whose shape parameter is almost cero corresponds to the GUMBEL distribution, locate their positions if they exist
Expand Down
Loading