fixing major memory wasting problem in memorygraphsafe

Author: Peter

core/run.sh

@@ -28,7 +28,7 @@ elif [ "$FILE" = "germany" ]; then
  LINK=http://download.geofabrik.de/osm/europe/germany.osm.bz2
 
  # For import we need a lot more memory. For the mmap storage you need to lower this in order to use off-heap memory.
- JAVA_OPTS_IMPORT="-XX:PermSize=20m -XX:MaxPermSize=20m -Xmx2700m -Xms2700m"
+ JAVA_OPTS_IMPORT="-XX:PermSize=10m -XX:MaxPermSize=10m -Xmx2700m -Xms2700m"
  JAVA_OPTS="-XX:PermSize=20m -XX:MaxPermSize=20m -Xmx2700m -Xms2700m"
  SIZE=35000000
 else

core/src/main/java/de/jetsli/graph/reader/OSMReader.java

@@ -15,7 +15,7 @@
  */
 package de.jetsli.graph.reader;
 
-import de.jetsli.graph.routing.DijkstraBidirectionRef;
+import de.jetsli.graph.routing.DijkstraBidirection;
 import de.jetsli.graph.storage.Storage;
 import de.jetsli.graph.util.CalcDistance;
 import de.jetsli.graph.routing.Path;
@@ -128,8 +128,8 @@ public void doDijkstra(int runs) throws Exception {
         Location2IDIndex index = new Location2IDQuadtree(g).prepareIndex(20000);
         double minLat = 49.484186, minLon = 8.974228;
         double maxLat = 50.541363, maxLon = 10.880356;
-        RoutingAlgorithm algo = new DijkstraBidirectionRef(g);
-//        RoutingAlgorithm algo = new DijkstraBidirection(g);
+//        RoutingAlgorithm algo = new DijkstraBidirectionRef(g);
+        RoutingAlgorithm algo = new DijkstraBidirection(g);
 //        RoutingAlgorithm algo = new DijkstraSimple(g);
 //        RoutingAlgorithm algo = new AStar(g);
 

core/src/main/java/de/jetsli/graph/storage/MemoryGraphSafe.java

@@ -126,8 +126,11 @@ private void ensureEdgePointer(int pointer) {
     private void ensureNodeIndex(int index) {
         if(index < size)
             return;
+                
         size = index + 1;
-        
+        if(size <= lats.length)
+            return;
+                
         int cap = Math.max(10, Math.round(size * FACTOR));
         // TODO deletedNodes = copy(deletedNodes, cap);
         lats = Arrays.copyOf(lats, cap);