From 361f2e3a35f022d6d27356f04eebdd3297076797 Mon Sep 17 00:00:00 2001
From: Giulia Baldini <44327645+giuliabaldini@users.noreply.github.com>
Date: Mon, 24 Jun 2024 14:30:27 +0200
Subject: [PATCH] 3 fix compilation for macos (#4)

* Remove useless imports

* Remove the randomness class

* Forgot to use seed
---
 bico/_core.cpp              | 11 -----------
 bico/clustering/bico.h      |  4 +---
 bico/misc/randomgenerator.h | 35 -----------------------------------
 bico/misc/randomness.cpp    |  5 -----
 bico/misc/randomness.h      | 36 ------------------------------------
 build_extension.py          |  1 -
 6 files changed, 1 insertion(+), 91 deletions(-)
 delete mode 100644 bico/misc/randomgenerator.h
 delete mode 100644 bico/misc/randomness.cpp
 delete mode 100644 bico/misc/randomness.h

diff --git a/bico/_core.cpp b/bico/_core.cpp
index b119d33..afcfdc9 100644
--- 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
index e7992e1..f931e92 100644
--- 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
deleted file mode 100644
index 1b12cc5..0000000
--- a/bico/misc/randomgenerator.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef RANDOMGENERATOR_H
-#define RANDOMGENERATOR_H
-
-/**
- * @brief Encapsulates an STL random generator.
- */
-class RandomGenerator
-{
-private:
-	std::mt19937 * generator;
-public:
-	typedef decltype((*generator)()) result_type;
-
-	RandomGenerator(std::mt19937 * generator) :
-		generator(generator)
-	{
-	}
-
-	result_type operator()()
-	{
-		return (*generator)();
-	}
-
-	result_type min()
-	{
-		return generator->min();
-	}
-
-	result_type max()
-	{
-		return generator->max();
-	}
-};
-
-#endif
diff --git a/bico/misc/randomness.cpp b/bico/misc/randomness.cpp
deleted file mode 100644
index dc18ae9..0000000
--- a/bico/misc/randomness.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "../misc/randomness.h"
-
-using namespace CluE;
-
-std::mt19937 Randomness::mt19937Generator(static_cast<unsigned int>(time(0)));
diff --git a/bico/misc/randomness.h b/bico/misc/randomness.h
deleted file mode 100644
index 2ce34cd..0000000
--- a/bico/misc/randomness.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef RANDOMNESS_H
-#define RANDOMNESS_H
-
-#include <random>
-#include <time.h>
-
-#include "randomgenerator.h"
-
-namespace CluE
-{
-/**
- * @brief Random number generator.
- *
- * @ingroup helper_classes
- */
-class Randomness
-{
-private:
-	// TODO Use mt19937_64 ?
-	static std::mt19937 mt19937Generator;
-
-public:
-	static RandomGenerator getRandomGenerator()
-	{
-		return RandomGenerator(&mt19937Generator);
-	}
-
-	static void initialize(uint_fast32_t seed)
-	{
-		mt19937Generator = std::mt19937(seed);
-	}
-};
-
-}
-
-#endif
diff --git a/build_extension.py b/build_extension.py
index 6663f8f..362c610 100644
--- 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",