Skip to content

Commit c35b007

Browse files
authored
Update deprecated parameter goalFunction in KMeasn (#24)
1 parent c7c4d7d commit c35b007

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

daal4py/kmeans.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,12 @@ def test_predict(X, X_init):
6767

6868
# Time fit
6969
fit_time, res = measure_function_time(test_fit, X_train, X_init, params=params)
70-
train_inertia = float(res.goalFunction[0, 0])
70+
train_inertia = float(res.objectiveFunction[0, 0])
7171

7272
# Time predict
7373
predict_time, res = measure_function_time(
7474
test_predict, X_test, X_init, params=params)
75-
test_inertia = float(res.goalFunction[0, 0])
75+
test_inertia = float(res.objectiveFunction[0, 0])
7676

7777
print_output(library='daal4py', algorithm='kmeans',
7878
stages=['training', 'prediction'], columns=columns,

native/kmeans_bench.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <algorithm>
1010
#include <iostream>
1111
#include <fstream>
12-
#include <chrono>
12+
#include <chrono>
1313

1414
#define DAAL_DATA_TYPE double
1515
#include "common.hpp"
@@ -38,7 +38,7 @@ kmeans_fit_test(dm::NumericTablePtr X_nt, dm::NumericTablePtr X_init_nt,
3838

3939
kmeans_result->get(da::kmeans::assignments);
4040
kmeans_result->get(da::kmeans::centroids );
41-
kmeans_result->get(da::kmeans::goalFunction);
41+
kmeans_result->get(da::kmeans::objectiveFunction);
4242

4343
dm::NumericTablePtr nIterationsNumericTable
4444
= algorithm.getResult()->get(da::kmeans::nIterations);
@@ -47,7 +47,7 @@ kmeans_fit_test(dm::NumericTablePtr X_nt, dm::NumericTablePtr X_init_nt,
4747
int *niPtr = blockNI.getBlockPtr();
4848
int actual_iters = niPtr[0];
4949
nIterationsNumericTable->releaseBlockOfRows(blockNI);
50-
50+
5151
if(actual_iters != max_iters && verbose) {
5252
std::cout << std::endl << "@ WARNING: Number of actual iterations "
5353
<< actual_iters << " is less than max_iters of "
@@ -147,7 +147,7 @@ int main(int argc, char *argv[]) {
147147
double* X_mult = (double*) daal::services::daal_malloc(
148148
X_nt->getNumberOfColumns() * X_nt->getNumberOfRows() *
149149
data_multiplier * sizeof(double));
150-
150+
151151
for (int i = 0; i < data_multiplier; i++) {
152152
for (int j = 0;
153153
j < X_nt->getNumberOfColumns() * X_nt->getNumberOfRows(); j++) {

0 commit comments

Comments
 (0)