Making via routes more stable

Elveris · Jul 21, 2011 · 83fca53 · 83fca53
1 parent e937359
commit 83fca53
Show file tree

Hide file tree

Showing 11 changed files with 123 additions and 168 deletions.
diff --git a/DataStructures/BinaryHeap.h b/DataStructures/BinaryHeap.h
@@ -209,6 +209,7 @@ class BinaryHeap {
     }
 
     void DecreaseKey( NodeID node, Weight weight ) {
+        assert( UINT_MAX != node );
         const Key index = nodeIndex[node];
         Key key = insertedNodes[index].key;
         assert ( key != 0 );

diff --git a/DataStructures/PhantomNodes.h b/DataStructures/PhantomNodes.h
@@ -48,7 +48,7 @@ struct PhantomNodes {
     }
 
     bool PhantomsAreOnSameEdge() const {
-        return ((startPhantom.startNode == startPhantom.targetNode && targetPhantom.startNode == targetPhantom.targetNode ) || (startPhantom.startNode == targetPhantom.targetNode && targetPhantom.startNode == startPhantom.targetNode));
+        return ((startPhantom.startNode == targetPhantom.startNode && startPhantom.targetNode == targetPhantom.targetNode ) || (startPhantom.startNode == targetPhantom.targetNode && targetPhantom.startNode == startPhantom.targetNode));
     }
 
     bool AtLeastOnePhantomNodeIsUINTMAX() const {

diff --git a/DataStructures/SearchEngine.h b/DataStructures/SearchEngine.h
diff --git a/DataStructures/StaticGraph.h b/DataStructures/StaticGraph.h
@@ -126,6 +126,11 @@ class StaticGraph {
         return smallestEdge;
     }
 
+    EdgeIterator FindEdgeInEitherDirection( const NodeIterator &from, const NodeIterator &to ) const {
+        EdgeIterator tmp =  FindEdge( from, to );
+        return (UINT_MAX != tmp ? tmp : FindEdge( to, from ));
+    }
+
     EdgeIterator FindEdgeIndicateIfReverse( const NodeIterator &from, const NodeIterator &to, bool & result ) const {
         EdgeIterator tmp =  FindEdge( from, to );
         if(UINT_MAX == tmp) {

diff --git a/DataStructures/XMLParser.h b/DataStructures/XMLParser.h
@@ -35,7 +35,7 @@ class XMLParser : public BaseParser<_Node, _RawRestrictionContainer, _Way> {
         WARN("Parsing plain .osm/.osm.bz2 is deprecated. Switch to .pbf");
         inputReader = inputReaderFactory(filename);
     }
-    ~XMLParser() {}
+    virtual ~XMLParser() {}
 
     bool RegisterCallbacks(bool (*nodeCallbackPointer)(_Node), bool (*restrictionCallbackPointer)(_RawRestrictionContainer), bool (*wayCallbackPointer)(_Way), bool (*addressCallbackPointer)(_Node, HashTable<std::string, std::string>) ) {
         nodeCallback = *nodeCallbackPointer;

diff --git a/Plugins/ObjectForPluginStruct.h b/Plugins/ObjectForPluginStruct.h
@@ -25,9 +25,14 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #include "../DataStructures/StaticGraph.h"
 #include "../Util/GraphLoader.h"
 
-typedef StaticGraph<EdgeData>::InputEdge InputEdge;
+typedef StaticGraph<EdgeData> QueryGraph;
+typedef QueryGraph::InputEdge InputEdge;
 
 struct ObjectsForQueryStruct {
+    NodeInformationHelpDesk * nodeHelpDesk;
+    std::vector<std::string> * names;
+    QueryGraph * graph;
+
     ObjectsForQueryStruct(std::string hsgrPath, std::string ramIndexPath, std::string fileIndexPath, std::string nodesPath, std::string namesPath, std::string psd = "route") {
         std::cout << "[objects] loading query data structures ..." << std::flush;
         //Init nearest neighbor data structure
@@ -37,14 +42,14 @@ struct ObjectsForQueryStruct {
 
         ifstream hsgrInStream(hsgrPath.c_str(), ios::binary);
         //Deserialize road network graph
-        std::vector< InputEdge> * edgeList = new std::vector< InputEdge>();
+        std::vector< InputEdge> edgeList;
         readHSGRFromStream(hsgrInStream, edgeList);
-        graph = new StaticGraph<EdgeData>(nodeHelpDesk->getNumberOfNodes()-1, *edgeList);
-        delete edgeList;
+        graph = new QueryGraph(nodeHelpDesk->getNumberOfNodes()-1, edgeList);
+        std::vector< InputEdge >().swap( edgeList ); //free memory
 
         //deserialize street name list
         ifstream namesInStream(namesPath.c_str(), ios::binary);
-        unsigned size = 0;
+        unsigned size(0);
         namesInStream.read((char *)&size, sizeof(unsigned));
         names = new std::vector<std::string>();
 
@@ -67,10 +72,6 @@ struct ObjectsForQueryStruct {
         delete graph;
         delete nodeHelpDesk;
     }
-
-    NodeInformationHelpDesk * nodeHelpDesk;
-    std::vector<std::string> * names;
-    StaticGraph<EdgeData> * graph;
 };
 
 #endif /* OBJECTFORPLUGINSTRUCT_H_ */
diff --git a/Plugins/RoutePlugin.h b/Plugins/RoutePlugin.h
@@ -57,7 +57,7 @@ class RoutePlugin : public BasePlugin {
         descriptorTable.Set("gpx", 2);
     }
 
-    ~RoutePlugin() {
+    virtual ~RoutePlugin() {
         DELETE(sEngine);
     }
 

diff --git a/Plugins/ViaRoutePlugin.h b/Plugins/ViaRoutePlugin.h
@@ -84,7 +84,7 @@ class ViaRoutePlugin : public BasePlugin {
         descriptorTable.Set("gpx", 2);
     }
 
-    ~ViaRoutePlugin() {
+    virtual ~ViaRoutePlugin() {
         for ( unsigned threadNum = 0; threadNum < threadData.size(); threadNum++ ) {
             DELETE( threadData[threadNum] );
         }
@@ -160,7 +160,7 @@ class ViaRoutePlugin : public BasePlugin {
             std::vector< _PathData > path;
             int distanceOfSegment = threadData[omp_get_thread_num()]->sEngine->ComputeRoute(segmentPhantomNodes, path);
 
-            if(UINT_MAX == threadData[omp_get_thread_num()]->distanceOfSegment || path.empty()) {
+            if(UINT_MAX == threadData[omp_get_thread_num()]->distanceOfSegment ) {
                 errorOccurredFlag = true;
                 cout << "Error occurred, path not found" << endl;
                 distance = UINT_MAX;

diff --git a/Util/GraphLoader.h b/Util/GraphLoader.h
@@ -247,6 +247,7 @@ NodeID readDTMPGraphFromStream(istream &in, vector<EdgeT>& edgeList, vector<Node
             break;
         default:
             weight = 0;
+            break;
         }
 
         weight = length*weight/3.6;
@@ -348,7 +349,7 @@ NodeID readDDSGGraphFromStream(istream &in, vector<EdgeT>& edgeList, vector<Node
 }
 
 template<typename EdgeT>
-unsigned readHSGRFromStream(istream &in, vector<EdgeT> * edgeList) {
+unsigned readHSGRFromStream(istream &in, vector<EdgeT> & edgeList) {
     unsigned numberOfNodes = 0;
     ExternalNodeMap nodeMap; nodeMap.set_empty_key(UINT_MAX);
     while(!in.eof()) {
@@ -384,7 +385,7 @@ unsigned readHSGRFromStream(istream &in, vector<EdgeT> * edgeList) {
         if(middle > numberOfNodes)
             numberOfNodes = middle;
 
-        edgeList->push_back(g);
+        edgeList.push_back(g);
     }
     return numberOfNodes+1;
 }

diff --git a/createHierarchy.cpp b/createHierarchy.cpp
@@ -52,7 +52,6 @@ or see http://www.gnu.org/licenses/agpl.txt.
 
 using namespace std;
 
-typedef ContractionCleanup::Edge::EdgeData EdgeData;
 typedef DynamicGraph<EdgeData>::InputEdge InputEdge;
 typedef StaticGraph<EdgeData>::InputEdge StaticEdge;
 typedef BaseConfiguration ContractorConfiguration;
@@ -195,4 +194,5 @@ int main (int argc, char *argv[]) {
     delete int2ExtNodeMap;
 
     cout << "finished" << endl;
+    return 0;
 }
diff --git a/typedefs.h b/typedefs.h
@@ -67,4 +67,9 @@ typedef NodeCoords<NodeID> NodeInfo;
 typedef ContractionCleanup::Edge::EdgeData EdgeData;
 #include "DataStructures/DynamicGraph.h"
 
+//Fix to make Eclipse 3.7 happy
+#ifndef __TIMESTAMP__
+#define __TIMESTAMP__ "unknown date"
+#endif
+
 #endif /* TYPEDEFS_H_ */