minor bug fix

cicirello · cicirello · commit e3d5a329b2bd · 2019-01-22T16:34:38.000-05:00
diff --git a/replication/org/cicirello/replication/bict2019/BICT2019.java b/replication/org/cicirello/replication/bict2019/BICT2019.java
@@ -475,7 +475,7 @@ private static double tourCostAsymmetric(double[][] cities, Permutation p) {
 			int end = p.get((i+1)%p.length());
 			double deltaX = cities[start][0] - cities[end][0];
 			double deltaY = cities[start][1] - cities[end][1];
-			double edgeCost = start < end ? Math.sqrt(deltaX*deltaX + deltaY*deltaY) : 2.0; 
+			double edgeCost = start < end || (end==0 && start==p.length()-1) ? Math.sqrt(deltaX*deltaX + deltaY*deltaY) : 2.0; 
 			cost = cost + edgeCost;
 		}
 		return cost;

Original file line number	Diff line number	Diff line change
`@@ -475,7 +475,7 @@ private static double tourCostAsymmetric(double[][] cities, Permutation p) {`
`475`	`475`	`int end = p.get((i+1)%p.length());`
`476`	`476`	`double deltaX = cities[start][0] - cities[end][0];`
`477`	`477`	`double deltaY = cities[start][1] - cities[end][1];`
`478`		`- double edgeCost = start < end ? Math.sqrt(deltaXdeltaX + deltaYdeltaY) : 2.0;`
	`478`	`+ double edgeCost = start < end \|\| (end==0 && start==p.length()-1) ? Math.sqrt(deltaXdeltaX + deltaYdeltaY) : 2.0;`
`479`	`479`	`cost = cost + edgeCost;`
`480`	`480`	`}`
`481`	`481`	`return cost;`