Use IPair instead of Tuple2

harry0000 · Nov 12, 2023 · 4cdad82 · 4cdad82
1 parent 84fca28
commit 4cdad82
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 20 deletions.
diff --git a/src/main/scala/io/github/acl4s/FenwickTree.scala b/src/main/scala/io/github/acl4s/FenwickTree.scala
@@ -2,7 +2,7 @@ package io.github.acl4s
 
 import scala.reflect.ClassTag
 
-import io.github.acl4s.internal.rightOpenInterval
+import io.github.acl4s.internal.{rightOpenInterval, IPair}
 
 /**
  * Reference: https://en.wikipedia.org/wiki/Fenwick_tree
@@ -34,7 +34,7 @@ case class FenwickTree[T: ClassTag](n: Int)(using m: AddSub[T]) {
   }
 
   def sum(range: Range): T = {
-    val (l, r) = rightOpenInterval(range)
+    val IPair(l, r) = rightOpenInterval(range)
     sum(l, r)
   }
 

diff --git a/src/main/scala/io/github/acl4s/LazySegtree.scala b/src/main/scala/io/github/acl4s/LazySegtree.scala
@@ -2,7 +2,7 @@ package io.github.acl4s
 
 import scala.reflect.ClassTag
 
-import io.github.acl4s.internal.{ceilPow2, rightOpenInterval}
+import io.github.acl4s.internal.{ceilPow2, rightOpenInterval, IPair}
 
 final case class LazySegtree[S, F](
   n: Int
@@ -48,7 +48,7 @@ final case class LazySegtree[S, F](
   }
 
   def prod(range: Range): S = {
-    val (l, r) = rightOpenInterval(range)
+    val IPair(l, r) = rightOpenInterval(range)
     prod(l, r)
   }
 
@@ -89,7 +89,7 @@ final case class LazySegtree[S, F](
   }
 
   def applyRange(range: Range, f: F): Unit = {
-    val (l, r) = rightOpenInterval(range)
+    val IPair(l, r) = rightOpenInterval(range)
     applyRange(l, r, f)
   }
 

diff --git a/src/main/scala/io/github/acl4s/Segtree.scala b/src/main/scala/io/github/acl4s/Segtree.scala
@@ -2,7 +2,7 @@ package io.github.acl4s
 
 import scala.reflect.ClassTag
 
-import io.github.acl4s.internal.{ceilPow2, rightOpenInterval}
+import io.github.acl4s.internal.{ceilPow2, rightOpenInterval, IPair}
 
 final case class Segtree[T](
   n: Int
@@ -30,7 +30,7 @@ final case class Segtree[T](
   }
 
   def prod(range: Range): T = {
-    val (l, r) = rightOpenInterval(range)
+    val IPair(l, r) = rightOpenInterval(range)
     prod(l, r)
   }
 

diff --git a/src/main/scala/io/github/acl4s/internal/Range.scala b/src/main/scala/io/github/acl4s/internal/Range.scala
@@ -1,12 +1,12 @@
 package io.github.acl4s.internal
 
-private[acl4s] def rightOpenInterval(range: Range): (Int, Int) = {
+private[acl4s] def rightOpenInterval(range: Range): IPair = {
   assert(range.step == 1 || range.step == -1)
   if (range.isEmpty) {
-    (range.start, range.start)
+    IPair(range.start, range.start)
   } else if (range.step > 0) {
-    (range.start, range.last + 1)
+    IPair(range.start, range.last + 1)
   } else {
-    (range.last, range.start + 1)
+    IPair(range.last, range.start + 1)
   }
 }
diff --git a/src/main/scala/io/github/acl4s/internal/Tuple.scala b/src/main/scala/io/github/acl4s/internal/Tuple.scala
@@ -1,3 +1,4 @@
 package io.github.acl4s.internal
 
+final case class IPair(a: Int, b: Int)
 final case class LPair(a: Long, b: Long)
diff --git a/src/test/scala/io/github/acl4s/internal/RangeSuite.scala b/src/test/scala/io/github/acl4s/internal/RangeSuite.scala
@@ -3,17 +3,17 @@ package io.github.acl4s.internal
 class RangeSuite extends munit.FunSuite {
 
   test("rightOpenInterval()") {
-    assertEquals(rightOpenInterval(0 to 10), (0, 11))
-    assertEquals(rightOpenInterval((0 to 10).reverse), (0, 11))
-    assertEquals(rightOpenInterval(10 to 0 by -1), (0, 11))
+    assertEquals(rightOpenInterval(0 to 10), IPair(0, 11))
+    assertEquals(rightOpenInterval((0 to 10).reverse), IPair(0, 11))
+    assertEquals(rightOpenInterval(10 to 0 by -1), IPair(0, 11))
 
-    assertEquals(rightOpenInterval(0 until 10), (0, 10))
-    assertEquals(rightOpenInterval((0 until 10).reverse), (0, 10))
-    assertEquals(rightOpenInterval(10 until 0 by -1), (1, 11))
+    assertEquals(rightOpenInterval(0 until 10), IPair(0, 10))
+    assertEquals(rightOpenInterval((0 until 10).reverse), IPair(0, 10))
+    assertEquals(rightOpenInterval(10 until 0 by -1), IPair(1, 11))
 
-    assertEquals(rightOpenInterval(0 to 0), (0, 1))
-    assertEquals(rightOpenInterval((0 until 0).reverse), (0, 0))
-    assertEquals(rightOpenInterval(0 until 0 by -1), (0, 0))
+    assertEquals(rightOpenInterval(0 to 0), IPair(0, 1))
+    assertEquals(rightOpenInterval((0 until 0).reverse), IPair(0, 0))
+    assertEquals(rightOpenInterval(0 until 0 by -1), IPair(0, 0))
   }
 
 }