]> git.nega.tv - josh/narcissus/commitdiff
narcissus-core: Use explicit order of operations
authorJoshua Simmons <josh@nega.tv>
Sun, 9 Jul 2023 21:21:17 +0000 (23:21 +0200)
committerJoshua Simmons <josh@nega.tv>
Sun, 9 Jul 2023 22:08:45 +0000 (00:08 +0200)
libs/narcissus-core/src/linear_log_binning.rs

index e20db51096308c7f1573c4ac4731d6ee17455df1..b3b0017f4108f73f0fa8f1ef314d18b6c9f841cb 100644 (file)
@@ -98,7 +98,7 @@ impl<const LINEAR_LOG2: u32, const SUB_BINS_LOG2: u32> Bin<LINEAR_LOG2, SUB_BINS
         let bin = self.bin();
         let sub_bin = self.sub_bin();
         if bin == 0 {
-            sub_bin * (1 << LINEAR_LOG2 - SUB_BINS_LOG2)
+            sub_bin * (1 << (LINEAR_LOG2 - SUB_BINS_LOG2))
         } else {
             let base = 1 << (bin + LINEAR_LOG2 - 1);
             let step = base >> SUB_BINS_LOG2;
@@ -114,7 +114,7 @@ impl<const LINEAR_LOG2: u32, const SUB_BINS_LOG2: u32> Bin<LINEAR_LOG2, SUB_BINS
             if sub_bin == 0 {
                 0
             } else {
-                (sub_bin + 1) * (1 << LINEAR_LOG2 - SUB_BINS_LOG2)
+                (sub_bin + 1) * (1 << (LINEAR_LOG2 - SUB_BINS_LOG2))
             }
         } else {
             let base = 1 << (bin + LINEAR_LOG2 - 1);