diff options
| author | Schuyler Eldridge | 2018-02-23 18:03:42 -0500 |
|---|---|---|
| committer | Albert Magyar | 2018-02-23 15:03:42 -0800 |
| commit | f295adc5e71e8970d8223552c4e9d0447bd72d1a (patch) | |
| tree | 33dd29bf0108e08ada953908edf4f4f9c2ea224c /src/main | |
| parent | 46b78943a726e4c9bf85ffb25a2ccf926b10dda7 (diff) | |
Add graph summation "+" to DiGraph (#744)
* Add DiGraph sum and DiGraph sum test
Signed-off-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>
* Make DiGraph sum deterministic
Signed-off-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>
* Remove ordered hashes/sets from DiGraphTests
Signed-off-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/scala/firrtl/graph/DiGraph.scala | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/main/scala/firrtl/graph/DiGraph.scala b/src/main/scala/firrtl/graph/DiGraph.scala index 6538c880..6dad56d7 100644 --- a/src/main/scala/firrtl/graph/DiGraph.scala +++ b/src/main/scala/firrtl/graph/DiGraph.scala @@ -308,6 +308,17 @@ class DiGraph[T] private[graph] (private[graph] val edges: LinkedHashMap[T, Link edges.foreach({ case (k, v) => eprime(f(k)) ++= v.map(f(_)) }) new DiGraph(eprime) } + + /** Graph sum of `this` and `that` + * + * @param that a second DiGraph[T] + * @return a DiGraph[T] containing all vertices and edges of each graph + */ + def +(that: DiGraph[T]): DiGraph[T] = { + val eprime = edges.clone + that.edges.map({ case (k, v) => eprime.getOrElseUpdate(k, new LinkedHashSet[T]) ++= v }) + new DiGraph(eprime) + } } class MutableDiGraph[T] extends DiGraph[T](new LinkedHashMap[T, LinkedHashSet[T]]) { |