From 5162649f98dcad8c03ac5b23add542ef7df57770 Mon Sep 17 00:00:00 2001 From: kai Date: Tue, 6 May 2025 14:45:29 +0200 Subject: [PATCH] fix parallel/aaron --- lab07/aaron/e2/upload/dbscan_parallel.h | 20 ++++++++++---------- lab07/aaron/e2/upload/run.cpp | 7 +++---- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/lab07/aaron/e2/upload/dbscan_parallel.h b/lab07/aaron/e2/upload/dbscan_parallel.h index 8584c6a..c769070 100644 --- a/lab07/aaron/e2/upload/dbscan_parallel.h +++ b/lab07/aaron/e2/upload/dbscan_parallel.h @@ -1,25 +1,25 @@ #ifndef DBSCAN_H #define DBSCAN_H -#include #include +#include #include "point.h" namespace HPC { class DBSCAN { - public: +public: DBSCAN(int minPts, double eps); - void run(const std::vector& points); + void run(const std::vector &points); - const std::vector& getPoints() const { return dataset_; } + const std::vector &getPoints() const { return dataset_; } - private: - std::set regionQuery(const Point& point) const; - std::set DBSCAN::initializeNeighbors(); - bool expandCluster(Point& point, std::set& neighbours, int clusterID); +private: + std::set regionQuery(const Point &point) const; + std::set initializeNeighbors(); + bool expandCluster(Point &point, std::set &neighbours, int clusterID); // void merge(std::vector& n, const std::vector& nPrime) const; @@ -32,6 +32,6 @@ class DBSCAN { std::vector dataset_; }; -} // namespace HPC +} // namespace HPC -#endif // DBSCAN_H +#endif // DBSCAN_H diff --git a/lab07/aaron/e2/upload/run.cpp b/lab07/aaron/e2/upload/run.cpp index a66ab54..f2eac9c 100644 --- a/lab07/aaron/e2/upload/run.cpp +++ b/lab07/aaron/e2/upload/run.cpp @@ -1,11 +1,10 @@ -#include -#include +#include "dbscan_parallel.h" #include -#include "dbscan.h" +#include +#include using namespace HPC; - int main() { std::vector points = readPointsFromFile("data");