Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/flexcode/loss_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def cde_loss(cde_estimates, z_grid, true_z):

n_obs, n_grid = cde_estimates.shape

term1 = np.mean(np.trapz(cde_estimates**2, z_grid.flatten()))
term1 = np.mean(np.trapezoid(cde_estimates**2, z_grid.flatten()))

nns = [np.argmin(np.abs(z_grid - true_z[ii])) for ii in range(n_obs)]
term2 = np.mean(cde_estimates[range(n_obs), nns])
Expand Down
2 changes: 1 addition & 1 deletion src/flexcode/regression_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ def __init__(self, max_basis, params, *args, **kwargs):
# Also, set the default values if not passed
params["max_depth"] = params.get("max_depth", 6)
params["learning_rate"] = params.get("learning_rate", 0.3)
params["silent"] = params.get("silent", 1)
params["verbosity"] = params.get("silent", 1)
params["objective"] = params.get("objective", "reg:linear")

params_opt, opt_flag = params_dict_optim_decision(params, multi_output=True)
Expand Down
6 changes: 3 additions & 3 deletions tests/flexcode/test_cv_optim.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ def test_coef_predict_same_as_predict_rf():


def test_coef_predict_same_as_predict_xgb():
x_train, z_train = generate_data(1000)
x_validation, z_validation = generate_data(1000)
x_test, _ = generate_data(1000)
x_train, z_train = generate_data(5000)
x_validation, z_validation = generate_data(5000)
x_test, _ = generate_data(5000)

# Parameterize model
model = flexcode.FlexCodeModel(
Expand Down
Loading