Changeset 1130 for cpp/frams/model/similarity/measure-distribution.cpp

Timestamp:

04/16/21 15:55:34 (3 years ago)

Author:

Maciej Komosinski

Message:

Used std::min(), std::max() explicitly to avoid compiler confusion. Used std::size() explicitly instead of the equivalent macro

File:

• cpp/frams/model/similarity/measure-distribution.cpp (modified) (1 diff)

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

@@ -79 +79 @@
         //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);
+        //      samples_taken = std::min(samples_num, size*size);
 
         rndgen.seed(55); //For determinism. Otherwise the descriptors (that choose samples pseudo-randomly) for the same Model can yield different values and so the dissimilarity between the object and its copy will not be 0.