From 78df3ae23a1c22a2d45a6bb3f63dc04bd2ab0c64 Mon Sep 17 00:00:00 2001
From: Dennis Luxen <luxen@kit.edu>
Date: Mon, 28 Mar 2011 12:49:09 +0000
Subject: [PATCH] renaming extractLargeNetwork to extractor

---
 SConstruct                               |  4 +---
 extractLargeNetwork.cpp => extractor.cpp | 16 +++-------------
 2 files changed, 4 insertions(+), 16 deletions(-)
 rename extractLargeNetwork.cpp => extractor.cpp (95%)

diff --git a/SConstruct b/SConstruct
index 1ccd2a32e..d206b980d 100644
--- a/SConstruct
+++ b/SConstruct
@@ -93,9 +93,7 @@ env.Append(CCFLAGS = ' -fopenmp')
 env.Append(LINKFLAGS = ' -fopenmp')
 env.StaticObject("DataStructures/pbf-proto/fileformat.pb.cc")
 env.StaticObject("DataStructures/pbf-proto/osmformat.pb.cc")
-env.Program("extractNetwork.cpp")
-env.Program("extractLargeNetwork.cpp")	
-env.Program("createHierarchy.cpp")
+env.Program("extractor.cpp")
 if os.path.exists("many-to-many.cpp"):
 	env.Program("many-to-many.cpp")
 env.Append(CCFLAGS = ' -lboost_regex -lboost_iostreams -lboost_system -lbz2 -lz -lprotobuf')
diff --git a/extractLargeNetwork.cpp b/extractor.cpp
similarity index 95%
rename from extractLargeNetwork.cpp
rename to extractor.cpp
index 09a34162f..3e63b2f73 100644
--- a/extractLargeNetwork.cpp
+++ b/extractor.cpp
@@ -185,7 +185,6 @@ int main (int argc, char *argv[]) {
                 fout.write((char*)&(nodesIT->id), sizeof(unsigned));
                 fout.write((char*)&(nodesIT->lon), sizeof(int));
                 fout.write((char*)&(nodesIT->lat), sizeof(int));
-                //                std::cout << "serializing: " << nodesIT->id << ", lat: " << nodesIT->lat << ", lon: " << nodesIT->lon << std::endl;
                 usedNodeCounter++;
                 usedNodeIDsIT++;
                 nodesIT++;
@@ -310,24 +309,15 @@ int main (int argc, char *argv[]) {
 
         std::cout << "[extractor] writing street name index ... " << std::flush;
         std::vector<unsigned> * nameIndex = new std::vector<unsigned>(nameVector.size()+1, 0);
-        unsigned currentNameIndex = 0;
-        unsigned elementCounter(0);
-        for(STXXLStringVector::iterator it = nameVector.begin(); it != nameVector.end(); it++) {
-            nameIndex->at(elementCounter) = currentNameIndex;
-            currentNameIndex += it->length();
-            elementCounter++;
-        }
-        nameIndex->at(nameVector.size()) = currentNameIndex;
         outputFileName.append(".names");
         std::ofstream nameOutFile(outputFileName.c_str(), std::ios::binary);
         unsigned sizeOfNameIndex = nameIndex->size();
         nameOutFile.write((char *)&(sizeOfNameIndex), sizeof(unsigned));
 
-        for(unsigned i = 0; i < nameIndex->size(); i++) {
-            nameOutFile.write((char *)&(nameIndex->at(i)), sizeof(unsigned));
-        }
         for(STXXLStringVector::iterator it = nameVector.begin(); it != nameVector.end(); it++) {
-            nameOutFile << *it;
+            unsigned lengthOfRawString = strlen(it->c_str());
+            nameOutFile.write((char *)&(lengthOfRawString), sizeof(unsigned));
+            nameOutFile.write(it->c_str(), lengthOfRawString);
         }
 
         nameOutFile.close();