Merge pull request experiencor#123 from mrshu/mrshu/get_anchors-fix

update: Fix gen_anchors.py
Yongyao · Jan 11, 2018 · 9b0ef52 · 9b0ef52
2 parents a3e3e92 + c78ed7f
commit 9b0ef52
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/gen_anchors.py b/gen_anchors.py
@@ -95,11 +95,7 @@ def run_kmeans(ann_dims, anchor_num):
         for i in range(ann_num):
             centroid_sums[assignments[i]]+=ann_dims[i]
         for j in range(anchor_num):
-<<<<<<< HEAD
             centroids[j] = centroid_sums[j]/(np.sum(assignments==j) + 1e-6)
-=======
-            centroids[j] = centroid_sums[j]/(np.sum(assignments==j))
->>>>>>> 4843db4a6c199941d8e4e57bdd86af7d33882c61
 
         prev_assignments = assignments.copy()
         old_distances = distances.copy()
@@ -138,4 +134,4 @@ def main(argv):
 
 if __name__ == '__main__':
     args = argparser.parse_args()
-    main(args)
+    main(args)