Removed Dead code
This commit is contained in:
Dennis Luxen
parent
75ba542c38
commit
d2c532e4d5
@ -214,10 +214,6 @@ private:
|
|||||||
int result = _ComputeDistance( _graph[i].source, _graph[i].target, threadData[omp_get_thread_num()] );
|
int result = _ComputeDistance( _graph[i].source, _graph[i].target, threadData[omp_get_thread_num()] );
|
||||||
if ( result < _graph[i].data.distance ) {
|
if ( result < _graph[i].data.distance ) {
|
||||||
_graph[i].data.forward = false;
|
_graph[i].data.forward = false;
|
||||||
Contractor::Witness temp;
|
|
||||||
temp.source = _graph[i].source;
|
|
||||||
temp.target = _graph[i].target;
|
|
||||||
temp.middleName.middle = _graph[i].data.middleName.middle;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ( _graph[i].data.backward ) {
|
if ( _graph[i].data.backward ) {
|
||||||
@ -225,10 +221,6 @@ private:
|
|||||||
|
|
||||||
if ( result < _graph[i].data.distance ) {
|
if ( result < _graph[i].data.distance ) {
|
||||||
_graph[i].data.backward = false;
|
_graph[i].data.backward = false;
|
||||||
Contractor::Witness temp;
|
|
||||||
temp.source = _graph[i].target;
|
|
||||||
temp.target = _graph[i].source;
|
|
||||||
temp.middleName.middle = _graph[i].data.middleName.middle;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -44,15 +44,6 @@ private:
|
|||||||
NodeID nameID;
|
NodeID nameID;
|
||||||
};
|
};
|
||||||
|
|
||||||
public:
|
|
||||||
|
|
||||||
struct Witness {
|
|
||||||
NodeID source;
|
|
||||||
NodeID target;
|
|
||||||
_MiddleName middleName;
|
|
||||||
};
|
|
||||||
|
|
||||||
private:
|
|
||||||
struct _EdgeData {
|
struct _EdgeData {
|
||||||
unsigned distance;
|
unsigned distance;
|
||||||
unsigned originalEdges : 29;
|
unsigned originalEdges : 29;
|
||||||
@ -78,7 +69,6 @@ private:
|
|||||||
struct _ThreadData {
|
struct _ThreadData {
|
||||||
_Heap heap;
|
_Heap heap;
|
||||||
std::vector< _ImportEdge > insertedEdges;
|
std::vector< _ImportEdge > insertedEdges;
|
||||||
std::vector< Witness > witnessList;
|
|
||||||
_ThreadData( NodeID nodes ): heap( nodes ) {
|
_ThreadData( NodeID nodes ): heap( nodes ) {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@ -1,142 +0,0 @@
|
|||||||
/*
|
|
||||||
open source routing machine
|
|
||||||
Copyright (C) Dennis Luxen, others 2010
|
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU AFFERO General Public License as published by
|
|
||||||
the Free Software Foundation; either version 3 of the License, or
|
|
||||||
any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Affero General Public License
|
|
||||||
along with this program; if not, write to the Free Software
|
|
||||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
||||||
or see http://www.gnu.org/licenses/agpl.txt.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef CREATEGRAPH_H
|
|
||||||
#define GRAPHLOADER_H
|
|
||||||
|
|
||||||
#include <cassert>
|
|
||||||
#include <cmath>
|
|
||||||
#include <fstream>
|
|
||||||
#include <iostream>
|
|
||||||
#include <iomanip>
|
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
#include <google/dense_hash_map>
|
|
||||||
|
|
||||||
#ifdef _GLIBCXX_PARALLEL
|
|
||||||
#include <parallel/algorithm>
|
|
||||||
#else
|
|
||||||
#include <algorithm>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "../DataStructures/ImportEdge.h"
|
|
||||||
#include "../typedefs.h"
|
|
||||||
|
|
||||||
typedef google::dense_hash_map<NodeID, NodeID> ExternalNodeMap;
|
|
||||||
|
|
||||||
template<typename EdgeT>
|
|
||||||
NodeID readOSRMGraphFromStream(istream &in, vector<EdgeT>& edgeList, vector<NodeInfo> * int2ExtNodeMap) {
|
|
||||||
NodeID n, source, target, id;
|
|
||||||
EdgeID m;
|
|
||||||
short locatable;
|
|
||||||
int dir, xcoord, ycoord;// direction (0 = open, 1 = forward, 2+ = open)
|
|
||||||
ExternalNodeMap ext2IntNodeMap;
|
|
||||||
ext2IntNodeMap.set_empty_key(UINT_MAX);
|
|
||||||
in >> n;
|
|
||||||
VERBOSE(cout << "Importing n = " << n << " nodes ..." << flush;)
|
|
||||||
for (NodeID i=0; i<n;i++) {
|
|
||||||
in >> id >> ycoord >> xcoord;
|
|
||||||
int2ExtNodeMap->push_back(NodeInfo(xcoord, ycoord, id));
|
|
||||||
ext2IntNodeMap.insert(make_pair(id, i));
|
|
||||||
}
|
|
||||||
in >> m;
|
|
||||||
VERBOSE(cout << " and " << m << " edges ..." << flush;)
|
|
||||||
|
|
||||||
edgeList.reserve(m);
|
|
||||||
for (EdgeID i=0; i<m; i++) {
|
|
||||||
EdgeWeight weight;
|
|
||||||
short type;
|
|
||||||
NodeID nameID;
|
|
||||||
int length;
|
|
||||||
in >> source >> target >> length >> dir >> weight >> type >> nameID;
|
|
||||||
assert(length > 0);
|
|
||||||
assert(weight > 0);
|
|
||||||
assert(0<=dir && dir<=2);
|
|
||||||
|
|
||||||
bool forward = true;
|
|
||||||
bool backward = true;
|
|
||||||
if (dir == 1) backward = false;
|
|
||||||
if (dir == 2) forward = false;
|
|
||||||
|
|
||||||
if(length == 0)
|
|
||||||
{ cerr << "loaded null length edge" << endl; exit(1); }
|
|
||||||
|
|
||||||
// translate the external NodeIDs to internal IDs
|
|
||||||
ExternalNodeMap::iterator intNodeID = ext2IntNodeMap.find(source);
|
|
||||||
if( ext2IntNodeMap.find(source) == ext2IntNodeMap.end())
|
|
||||||
{
|
|
||||||
cerr << "after " << edgeList.size() << " edges" << endl;
|
|
||||||
cerr << "->" << source << "," << target << "," << length << "," << dir << "," << weight << endl;
|
|
||||||
cerr << "unresolved source NodeID: " << source << endl; exit(0);
|
|
||||||
}
|
|
||||||
source = intNodeID->second;
|
|
||||||
intNodeID = ext2IntNodeMap.find(target);
|
|
||||||
if(ext2IntNodeMap.find(target) == ext2IntNodeMap.end()) { cerr << "unresolved target NodeID : " << target << endl; exit(0); }
|
|
||||||
target = intNodeID->second;
|
|
||||||
|
|
||||||
if(source == UINT_MAX || target == UINT_MAX) { cerr << "nonexisting source or target" << endl; exit(0); }
|
|
||||||
|
|
||||||
EdgeT inputEdge(source, target, nameID, weight, forward, backward, type );
|
|
||||||
edgeList.push_back(inputEdge);
|
|
||||||
}
|
|
||||||
ext2IntNodeMap.clear();
|
|
||||||
vector<ImportEdge>(edgeList.begin(), edgeList.end()).swap(edgeList); //remove excess candidates.
|
|
||||||
cout << "ok" << endl;
|
|
||||||
return n;
|
|
||||||
}
|
|
||||||
|
|
||||||
template<typename EdgeT>
|
|
||||||
void readHSGRFromStream(istream &in, vector<EdgeT> * edgeList) {
|
|
||||||
while(!in.eof())
|
|
||||||
{
|
|
||||||
EdgeT g;
|
|
||||||
EdgeData e;
|
|
||||||
|
|
||||||
int distance;
|
|
||||||
bool shortcut;
|
|
||||||
bool forward;
|
|
||||||
bool backward;
|
|
||||||
bool forwardTurn;
|
|
||||||
bool backwardTurn;
|
|
||||||
short type;
|
|
||||||
NodeID middle;
|
|
||||||
NodeID source;
|
|
||||||
NodeID target;
|
|
||||||
|
|
||||||
in.read((char *)&(distance), sizeof(int));
|
|
||||||
assert(distance > 0);
|
|
||||||
in.read((char *)&(forwardTurn), sizeof(bool));
|
|
||||||
in.read((char *)&(backwardTurn), sizeof(bool));
|
|
||||||
in.read((char *)&(shortcut), sizeof(bool));
|
|
||||||
in.read((char *)&(forward), sizeof(bool));
|
|
||||||
in.read((char *)&(backward), sizeof(bool));
|
|
||||||
in.read((char *)&(middle), sizeof(NodeID));
|
|
||||||
in.read((char *)&(type), sizeof(short));
|
|
||||||
in.read((char *)&(source), sizeof(NodeID));
|
|
||||||
in.read((char *)&(target), sizeof(NodeID));
|
|
||||||
e.backward = backward; e.distance = distance; e.forward = forward; e.middleName.middle = middle; e.shortcut = shortcut; e.type = type;
|
|
||||||
e.forwardTurn = forwardTurn; e.backwardTurn = backwardTurn;
|
|
||||||
g.data = e; g.source = source; g.target = target;
|
|
||||||
|
|
||||||
edgeList->push_back(g);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
#endif // CREATEGRAPH_H
|
|
||||||
Loading…
Reference in New Issue
Block a user