diff options
| author | Leway Colin | 2019-07-09 01:41:02 +0800 |
|---|---|---|
| committer | mergify[bot] | 2019-07-08 17:41:02 +0000 |
| commit | aa571e1d4f76d095344a9deed28dfa70f704fa75 (patch) | |
| tree | 77e34d92f04f32f7c3c28bde8c9dac2892943ac5 /src/main/scala/firrtl/graph | |
| parent | 648dddeacd9aece4a43cad09430dad25cba69457 (diff) | |
Remove some warnings (#1118)
Diffstat (limited to 'src/main/scala/firrtl/graph')
| -rw-r--r-- | src/main/scala/firrtl/graph/DiGraph.scala | 6 | ||||
| -rw-r--r-- | src/main/scala/firrtl/graph/EulerTour.scala | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/main/scala/firrtl/graph/DiGraph.scala b/src/main/scala/firrtl/graph/DiGraph.scala index 3fa0ade7..cc100441 100644 --- a/src/main/scala/firrtl/graph/DiGraph.scala +++ b/src/main/scala/firrtl/graph/DiGraph.scala @@ -78,7 +78,7 @@ class DiGraph[T] private[graph] (private[graph] val edges: LinkedHashMap[T, Link val unmarked = new mutable.LinkedHashSet[T] val tempMarked = new mutable.LinkedHashSet[T] - case class LinearizeFrame[T](v: T, expanded: Boolean) + case class LinearizeFrame[A](v: A, expanded: Boolean) val callStack = mutable.Stack[LinearizeFrame[T]]() unmarked ++= seed.getOrElse(getVertices) @@ -239,7 +239,7 @@ class DiGraph[T] private[graph] (private[graph] val edges: LinkedHashMap[T, Link * created on the last iteration where the current frame was * active is sufficient to track the position. */ - class StrongConnectFrame[T](val v: T, val edgeIter: Iterator[T], var childCall: Option[T] = None) + class StrongConnectFrame[A](val v: A, val edgeIter: Iterator[A], var childCall: Option[A] = None) val callStack = new mutable.Stack[StrongConnectFrame[T]] for (node <- getVertices) { @@ -331,7 +331,7 @@ class DiGraph[T] private[graph] (private[graph] val edges: LinkedHashMap[T, Link private def filterEdges(vprime: Set[T]): LinkedHashMap[T, LinkedHashSet[T]] = { def filterNodeSet(s: LinkedHashSet[T]): LinkedHashSet[T] = s.filter({ case (k) => vprime.contains(k) }) def filterAdjacencyLists(m: LinkedHashMap[T, LinkedHashSet[T]]): LinkedHashMap[T, LinkedHashSet[T]] = m.map({ case (k, v) => (k, filterNodeSet(v)) }) - var eprime: LinkedHashMap[T, LinkedHashSet[T]] = edges.filter({ case (k, v) => vprime.contains(k) }) + val eprime: LinkedHashMap[T, LinkedHashSet[T]] = edges.filter({ case (k, v) => vprime.contains(k) }) filterAdjacencyLists(eprime) } diff --git a/src/main/scala/firrtl/graph/EulerTour.scala b/src/main/scala/firrtl/graph/EulerTour.scala index 29c97b20..1e3b02ca 100644 --- a/src/main/scala/firrtl/graph/EulerTour.scala +++ b/src/main/scala/firrtl/graph/EulerTour.scala @@ -112,7 +112,7 @@ class EulerTour[T](r: Map[T, Int], e: Seq[T], h: Seq[Int]) { * entry in the range is different from the last by only +-1 */ private def constructTableLookups(n: Int): Array[Array[Array[Int]]] = { - def sortSeqSeq[T <: Int](x: Seq[T], y: Seq[T]): Boolean = { + def sortSeqSeq[A <: Int](x: Seq[A], y: Seq[A]): Boolean = { if (x(0) != y(0)) x(0) < y(0) else sortSeqSeq(x.tail, y.tail) } @@ -122,7 +122,7 @@ class EulerTour[T](r: Map[T, Int], e: Seq[T], h: Seq[Int]) { .sortWith(sortSeqSeq) .map(_.foldLeft(Seq(0))((h, pm) => (h.head + pm) +: h).reverse) .map{ a => - var tmp = Array.ofDim[Int](m, m) + val tmp = Array.ofDim[Int](m, m) for (i <- 0 to size; j <- i to size) yield { val window = a.slice(i, j + 1) tmp(i)(j) = window.indexOf(window.min) + i } |
