Changeset 1121 for cpp/frams/model

Timestamp:

04/01/21 17:17:15 (4 years ago)

Author:

Maciej Komosinski

Message:

Added comments, removed unused variables

File:

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

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

@@ -70 +70 @@
 void SimilMeasureDistribution::calculateFun(std::pair<double, float> *fun, const Model &sampled)
 {
-        int size = sampled.getPartCount();
         int samples_taken = samples_num;
 
-        //Check if total number of points pairs is smaller than samples number
-        //but first, prevent exceeding int limits
-        //if (size < (int) sqrt((double) std::numeric_limits<int>::max()))
+        //Check if total number of point pairs is smaller than samples number (just to avoid the calculation of the same stats for the same pairs of Parts)
+        //This optimization turned out to have a minor effect, only present for very high simil_samples_num, and was not perfect anyway:
+        //- samples are selected randomly so there are no guarantees that they will be repeated,
+        //- even if they do, it has the benefit of averaging the result that becomes more stable,
+        //- the concept of "point pairs" is not relevant when we randomly select more than two points, as some descriptors do.
+        //int size = sampled.getPartCount();
+        //if (size < (int) sqrt((double) std::numeric_limits<int>::max())) //prevent exceeding int limits
         //      samples_taken = min(samples_num, size*size);
 
@@ -166 +169 @@
 void SimilMeasureDistribution::D2(int samples_taken, std::uniform_int_distribution<> &distribution, const Model &sampled, std::vector<double> &dist_vect)
 {
-        int size = sampled.getPartCount();
         for (int i = 0; i < samples_taken; i++)
         {
@@ -227 +229 @@
 void SimilMeasureDistribution::A3(int samples_taken, std::uniform_int_distribution<> &distribution, const Model &sampled, std::vector<double> &dist_vect)
 {
-        int size = sampled.getPartCount();
         for (int i = 0; i < samples_taken; i++)
         {