Changeset 1120 for cpp/frams/model/similarity/measure-distribution.h

Timestamp:

04/01/21 17:07:37 (3 years ago)

Author:

Maciej Komosinski

Message:

Used a local random number generator for full determinism. Introduced a few refactorings for better performance.

File:

• cpp/frams/model/similarity/measure-distribution.h (modified) (4 diffs)

cpp/frams/model/similarity/measure-distribution.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2021  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -8 +8 @@
 #include "simil-measure-base.h"
 #include "EMD/emd.h"
+#include <random>
 
 class SimilMeasureDistribution : public SimilMeasureBase
@@ -13 +14 @@
 public:
         SimilMeasureDistribution();
-        ~SimilMeasureDistribution(){};
+        ~SimilMeasureDistribution() {};
         int setParams(std::vector<double> params);
         void calculateFuns();
-        void calculateFun(std::pair<double, float> *fun, Model &sampled);
+        void calculateFun(std::pair<double, float> *fun, const Model &sampled);
         double compareFuns();
         double EMD(std::pair<double, float> *fun1, std::pair<double, float> *fun2);
@@ -28 +29 @@
         std::pair<double, float> *funs[2];
         SolidsShapeTypeModel *sst_models[2];
-        std::vector<double> (SimilMeasureDistribution::*distribution_fun)(int samples_taken, Model *sampled);
+        void (SimilMeasureDistribution::*distribution_fun)(int samples_taken, std::uniform_int_distribution<> &distribution, const Model &sampled, std::vector<double> &dist_vect);
 
         void fillPointsWeights(std::pair<double, float> *fun, feature_t *points, float *weights);
         double getDistance();
-        std::vector<double> D2(int samples_taken, Model *sampled);
-        std::vector<double> D1(int samples_taken, Model *sampled);
-        std::vector<double> D3(int samples_taken, Model *sampled);
-        std::vector<double> D4(int samples_taken, Model *sampled);
-        std::vector<double> A3(int samples_taken, Model *sampled);
+        void D2(int samples_taken, std::uniform_int_distribution<> &distribution, const Model &sampled, std::vector<double> &dist_vect);
+        void D1(int samples_taken, std::uniform_int_distribution<> &distribution, const Model &sampled, std::vector<double> &dist_vect);
+        void D3(int samples_taken, std::uniform_int_distribution<> &distribution, const Model &sampled, std::vector<double> &dist_vect);
+        void D4(int samples_taken, std::uniform_int_distribution<> &distribution, const Model &sampled, std::vector<double> &dist_vect);
+        void A3(int samples_taken, std::uniform_int_distribution<> &distribution, const Model &sampled, std::vector<double> &dist_vect);
+
+private:
+        std::mt19937 rndgen;
 };