fix lint and rng nextInt (#6)

GeoDaCenter · Jul 1, 2023 · 8392c51 · 8392c51
1 parent 6ba7bf3
commit 8392c51
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/clustering/pam.cpp b/clustering/pam.cpp
@@ -63,10 +63,10 @@ std::vector<int> BUILD::run(const std::vector<int>& ids, int k)
                 continue;
             }
             double sum = 0., v;
-            for (int k=0; k<nn; ++k) {
-                v = std::min(dist->getDistance(ids[j], ids[k]), mindist[ids[k]]);
+            for (int m=0; m<nn; ++m) {
+                v = std::min(dist->getDistance(ids[j], ids[m]), mindist[ids[m]]);
                 sum += v;
-                tempd[ ids[k] ]  =  v;
+                tempd[ ids[m] ]  =  v;
             }
             if(sum < best) {
                 best = sum;

diff --git a/rng.h b/rng.h
@@ -58,9 +58,8 @@ class Xoroshiro128Random
     }
     int nextInt(int n) {
         if (n <=0) return 0;
-        int r =  (int)((n & -n) == n ? (nextLong() & n) - 1 // power of two
-                       : (unsigned long long)(((unsigned long long)nextLong() >> 32) * n) >> 32);
-        return r >= 0 && r < n ? r : 0;
+        int r =  (int)((((unsigned long long)nextLong() >> 32) * n) >> 32);
+        return r;
     }
 
     long long nextLong() {