commit | 2398d960b9328bdc69bdc50e1539f0627e11e407 | [log] [tgz] |
---|---|---|
author | Andrey Komarov <andrey.komarov@NetCracker.com> | Mon Sep 26 15:11:23 2016 +0300 |
committer | Yuta HIGUCHI <y-higuchi@onlab.us> | Mon Jan 23 17:27:20 2017 +0000 |
tree | c12a3eb61e4d581592fae64a49c4b1fe41492096 | |
parent | 71a0fa4468d06e9902e735314981b2485373b946 [diff] [blame] |
Vector cost proposed to TST on 2016-07-13 First part implemented: weight interface introduced and integrated, default weight implementation added. Change-Id: Ia46f1b44139069aa171a3c13faf168351bd7cc56
diff --git a/utils/misc/src/main/java/org/onlab/graph/DisjointPathPair.java b/utils/misc/src/main/java/org/onlab/graph/DisjointPathPair.java index 1e8d3d6..6436ad4 100644 --- a/utils/misc/src/main/java/org/onlab/graph/DisjointPathPair.java +++ b/utils/misc/src/main/java/org/onlab/graph/DisjointPathPair.java
@@ -73,8 +73,8 @@ } @Override - public double cost() { - return hasBackup() ? primary.cost() + secondary.cost() : primary.cost(); + public Weight cost() { + return hasBackup() ? primary.cost().merge(secondary.cost()) : primary.cost(); } @Override