3 fix compilation for macos (#4)

* Remove useless imports * Remove the randomness class * Forgot to use seed
algo-hhu · Jun 24, 2024 · 361f2e3 · 361f2e3
1 parent 662fd48
commit 361f2e3
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 91 deletions.
diff --git a/bico/_core.cpp b/bico/_core.cpp
@@ -1,23 +1,12 @@
 #include <Python.h>
 
-#include <iostream>
-#include <sstream>
-#include <fstream>
-#include <random>
-#include <ctime>
-#include <time.h>
-
 #include "point/l2metric.h"
 #include "point/squaredl2metric.h"
 #include "point/point.h"
 #include "point/pointweightmodifier.h"
 #include "clustering/bico.h"
-#include "misc/randomness.h"
-#include "misc/randomgenerator.h"
 #include "datastructure/proxysolution.h"
 #include "point/pointcentroid.h"
-#include "point/pointweightmodifier.h"
-#include "point/realspaceprovider.h"
 
 typedef unsigned int uint;
 

diff --git a/bico/clustering/bico.h b/bico/clustering/bico.h
@@ -18,7 +18,6 @@
 #include "../datastructure/proxysolution.h"
 #include "../evaluation/kmeansevaluator.h"
 #include "../exception/invalidruntimeconfigurationexception.h"
-#include "../misc/randomness.h"
 
 namespace CluE
 {
@@ -541,8 +540,7 @@ minDist(std::numeric_limits<double>::infinity()),
 pairwise_different(0),
 numOfRebuilds(0)
 {
-    Randomness::initialize(seed);
-    RandomGenerator rg = Randomness::getRandomGenerator();
+    std::mt19937 rg(seed);
     std::vector<double> rndpoint(dimension);
     rndprojections.resize(L);
     bucket_radius.resize(L);

diff --git a/bico/misc/randomgenerator.h b/bico/misc/randomgenerator.h
diff --git a/bico/misc/randomness.cpp b/bico/misc/randomness.cpp
diff --git a/bico/misc/randomness.h b/bico/misc/randomness.h
diff --git a/build_extension.py b/build_extension.py
@@ -8,7 +8,6 @@
     name="bico._core",
     sources=[
         "bico/_core.cpp",
-        "bico/misc/randomness.cpp",
         "bico/point/pointcentroid.cpp",
         "bico/point/squaredl2metric.cpp",
         "bico/point/point.cpp",