From 478dc95c8f566128d5f9dc78de236c047c3c496c Mon Sep 17 00:00:00 2001 From: iMoHax Date: Mon, 25 Aug 2014 22:22:00 +0400 Subject: [PATCH] checking distance on compared routes --- core/src/main/java/ru/trader/graph/RouteGraph.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/ru/trader/graph/RouteGraph.java b/core/src/main/java/ru/trader/graph/RouteGraph.java index 606c61d..47d4db4 100644 --- a/core/src/main/java/ru/trader/graph/RouteGraph.java +++ b/core/src/main/java/ru/trader/graph/RouteGraph.java @@ -13,7 +13,13 @@ public class RouteGraph extends Graph { PathRoute r1 = (PathRoute) p1.getRoot(); PathRoute r2 = (PathRoute) p2.getRoot(); - return Double.compare(r2.getProfit()/r2.getLandsCount(), r1.getProfit()/r1.getLandsCount()); + int cmp = Double.compare(r2.getProfit()/r2.getLandsCount(), r1.getProfit()/r1.getLandsCount()); + if (cmp != 0 ) return cmp; + cmp = Double.compare(r1.getDistance(), r2.getDistance()); + if (cmp != 0) return cmp; + cmp = Double.compare(r1.getLandsCount(), r2.getLandsCount()); + if (cmp != 0) return cmp; + return cmp; };