Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add the ability to sort points door-to-door without keeping the position of the last point

Browse source
This commit is contained in:
Alexander Sytnyk 2018-03-07 11:04:38 +02:00
parent 5cce57107e
commit 957fa9eae0
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
OsmAnd-java/src/net/osmand/TspAnt.java
View file

@ -1,11 +1,11 @@
package net.osmand;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Random;
import net.osmand.data.LatLon;
import net.osmand.util.MapUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
/*
* === Implementation of ant swarm TSP solver. ===
*
@ -106,10 +106,13 @@ public class TspAnt {
// Allocates all memory.
// Adds 1 to edge lengths to ensure no zero length edges.
public TspAnt readGraph(List<LatLon> intermediates, LatLon start, LatLon end) {
boolean keepEndPoint = end != null;
List<LatLon> l = new ArrayList<LatLon>();
l.add(start);
l.addAll(intermediates);
l.add(end);
if (keepEndPoint) {
l.add(end);
}
n = l.size() ;
// System.out.println("Cost");
graph = new double[n][n];
@ -125,7 +128,7 @@ public class TspAnt {
}
maxSum = Math.rint(maxSum) + 1;
for (int i = 0; i < n; i++) {
if (i == n - 1) {
if (keepEndPoint && i == n - 1) {
graph[i][0] = 0.1;
} else {
graph[i][0] = maxSum;