Skip to content

Commit d397f0c

Browse files
bugfix
1 parent 0f42709 commit d397f0c

File tree

4 files changed

+4
-9
lines changed

4 files changed

+4
-9
lines changed

cpp/APLRRegressor.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1134,15 +1134,10 @@ VectorXd APLRRegressor::calculate_neg_gradient_current()
11341134
VectorXd APLRRegressor::calculate_neg_gradient_current_for_group_mse(GroupData &group_residuals_and_count, const VectorXi &group,
11351135
const std::set<int> &unique_groups)
11361136
{
1137-
for (int unique_group_value : unique_groups)
1138-
{
1139-
group_residuals_and_count.error[unique_group_value] /= group_residuals_and_count.count[unique_group_value];
1140-
}
1141-
11421137
VectorXd output{VectorXd(y_train.rows())};
11431138
for (Eigen::Index i = 0; i < y_train.size(); ++i)
11441139
{
1145-
output[i] = group_residuals_and_count.error[group[i]] * sample_weight_train[i];
1140+
output[i] = group_residuals_and_count.error[group[i]];
11461141
}
11471142

11481143
return output;

cpp/tests.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -952,7 +952,7 @@ class Tests
952952
save_as_csv_file("data/output.csv", predictions);
953953

954954
std::cout << predictions.mean() << "\n\n";
955-
tests.push_back(is_approximately_equal(predictions.mean(), 20.849747430496922));
955+
tests.push_back(is_approximately_equal(predictions.mean(), 23.900212415566287));
956956
}
957957

958958
void test_aplrregressor_group_mse_cycle()
@@ -995,7 +995,7 @@ class Tests
995995
save_as_csv_file("data/output.csv", predictions);
996996

997997
std::cout << predictions.mean() << "\n\n";
998-
tests.push_back(is_approximately_equal(predictions.mean(), 23.529085584946195));
998+
tests.push_back(is_approximately_equal(predictions.mean(), 24.014522054509584));
999999
}
10001000

10011001
void test_aplrregressor_int_constr()
Binary file not shown.

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
setuptools.setup(
2929
name="aplr",
30-
version="10.7.2",
30+
version="10.7.3",
3131
description="Automatic Piecewise Linear Regression",
3232
ext_modules=[sfc_module],
3333
author="Mathias von Ottenbreit",

0 commit comments

Comments
 (0)