From c3837443add9bab7f7feea3e6fcb201ea24fb27a Mon Sep 17 00:00:00 2001 From: Andrea Mola Date: Thu, 8 Apr 2021 11:08:05 +0200 Subject: [PATCH] fixed extra param pass to RBFfactory functions.removed *power* calls --- pygem/rbf.py | 4 ++-- tests/test_datasets/parameters_rbf_bugged_01.prm | 1 - tests/test_datasets/parameters_rbf_bugged_02.prm | 1 - tests/test_datasets/parameters_rbf_cube.prm | 3 --- tests/test_datasets/parameters_rbf_cube_out_true.prm | 3 --- tests/test_datasets/parameters_rbf_default.prm | 3 --- 6 files changed, 2 insertions(+), 13 deletions(-) diff --git a/pygem/rbf.py b/pygem/rbf.py index c996bb5..ed29ff3 100644 --- a/pygem/rbf.py +++ b/pygem/rbf.py @@ -392,8 +392,8 @@ def __call__(self, src_pts): H = np.zeros((src_pts.shape[0], self.n_control_points + 3 + 1)) H[:, :self.n_control_points] = self.basis( cdist(src_pts, self.original_control_points), - self.radius) - #**self.extra) + self.radius, + **self.extra) H[:, self.n_control_points] = 1.0 H[:, -3:] = src_pts return np.asarray(np.dot(H, self.weights)) diff --git a/tests/test_datasets/parameters_rbf_bugged_01.prm b/tests/test_datasets/parameters_rbf_bugged_01.prm index f4a4559..f4a3f92 100644 --- a/tests/test_datasets/parameters_rbf_bugged_01.prm +++ b/tests/test_datasets/parameters_rbf_bugged_01.prm @@ -12,7 +12,6 @@ basis function: gaussian_spline # of the class RBF for details. radius: 0.5 -power = 2 [Control points] # This section describes the RBF control points. diff --git a/tests/test_datasets/parameters_rbf_bugged_02.prm b/tests/test_datasets/parameters_rbf_bugged_02.prm index c933eb3..fa20407 100644 --- a/tests/test_datasets/parameters_rbf_bugged_02.prm +++ b/tests/test_datasets/parameters_rbf_bugged_02.prm @@ -12,7 +12,6 @@ basis function: gaussian_splines # of the class RBF for details. radius: 0.5 -power = 2 [Control points] # This section describes the RBF control points. diff --git a/tests/test_datasets/parameters_rbf_cube.prm b/tests/test_datasets/parameters_rbf_cube.prm index 81eb4ef..58e8d44 100644 --- a/tests/test_datasets/parameters_rbf_cube.prm +++ b/tests/test_datasets/parameters_rbf_cube.prm @@ -12,9 +12,6 @@ basis function: gaussian_spline # of the class RBF for details. radius: 0.5 -# The power parameter k for polyharmonic spline -# See the documentation for details -power: 2 [Control points] diff --git a/tests/test_datasets/parameters_rbf_cube_out_true.prm b/tests/test_datasets/parameters_rbf_cube_out_true.prm index 463f2bf..6f89706 100644 --- a/tests/test_datasets/parameters_rbf_cube_out_true.prm +++ b/tests/test_datasets/parameters_rbf_cube_out_true.prm @@ -12,9 +12,6 @@ basis function: gaussian_spline # of the class RBF for details. radius: 0.5 -# The power parameter k for polyharmonic spline -# See the documentation for details -power: 2 [Control points] diff --git a/tests/test_datasets/parameters_rbf_default.prm b/tests/test_datasets/parameters_rbf_default.prm index d41b03f..66d192e 100644 --- a/tests/test_datasets/parameters_rbf_default.prm +++ b/tests/test_datasets/parameters_rbf_default.prm @@ -12,9 +12,6 @@ basis function: gaussian_spline # of the class RBF for details. radius: 0.5 -# The power parameter k for polyharmonic spline -# See the documentation for details -power: 2 [Control points]