Skip to content

Commit 5b10b7e

Browse files
committed
Added weight to coordiantes returned by PointView
1 parent 9ed25eb commit 5b10b7e

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

include/CLUEstering/core/detail/ClusteringKernels.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace clue::detail {
2626
internal::TilesView<Ndim>& tiles,
2727
PointsView<Ndim>& dev_points,
2828
const KernelType& kernel,
29-
const std::array<float, Ndim>& coords_i,
29+
const std::array<float, Ndim + 1>& coords_i,
3030
float& rho_i,
3131
const DistanceParameter<Ndim>& dc,
3232
int32_t point_id) {
@@ -95,7 +95,7 @@ namespace clue::detail {
9595
const clue::SearchBoxBins<Ndim>& search_box,
9696
internal::TilesView<Ndim>& tiles,
9797
PointsView<Ndim>& dev_points,
98-
const std::array<float, Ndim>& coords_i,
98+
const std::array<float, Ndim + 1>& coords_i,
9999
float rho_i,
100100
float& delta_i,
101101
int& nh_i,

include/CLUEstering/data_structures/internal/PointsCommon.hpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,11 @@ namespace clue {
7474

7575
ALPAKA_FN_HOST_ACC auto operator[](int i) const {
7676
if (i == -1)
77-
return clue::nostd::make_array<float, Ndim>(std::numeric_limits<float>::max());
77+
return clue::nostd::make_array<float, Ndim + 1>(std::numeric_limits<float>::max());
7878

79-
std::array<float, Ndim> point;
79+
std::array<float, Ndim + 1> point;
8080
meta::apply<Ndim>([&]<std::size_t Dim>() { point[Dim] = coords[Dim][i]; });
81+
point[Ndim] = weight[i];
8182
return point;
8283
}
8384
};

include/CLUEstering/data_structures/internal/TilesView.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ namespace clue::internal {
9797
return remainder;
9898
}
9999

100-
ALPAKA_FN_ACC inline auto distance(const std::array<float, Ndim>& coord_i,
101-
const std::array<float, Ndim>& coord_j) const {
100+
ALPAKA_FN_ACC inline auto distance(const std::array<float, Ndim + 1>& coord_i,
101+
const std::array<float, Ndim + 1>& coord_j) const {
102102
std::array<float, Ndim> distance_vector;
103103
for (auto dim = 0u; dim != Ndim; ++dim) {
104104
if (wrapping[dim])

0 commit comments

Comments
 (0)