Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Moving XOR-FastHash to its own File

Browse Source
This commit is contained in:
DennisOSRM
2012-05-25 11:41:52 +02:00
parent 7194fe02d1
commit e29b19805c
2 changed files with 81 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Contractor/Contractor.h
+14 -38
View File
@@ -31,16 +31,14 @@ or see http://www.gnu.org/licenses/agpl.txt.
#include <boost/shared_ptr.hpp>
#include "../DataStructures/BinaryHeap.h"
#include "../DataStructures/DeallocatingVector.h"
#include "../DataStructures/DynamicGraph.h"
#include "../DataStructures/Percent.h"
#include "../DataStructures/BinaryHeap.h"
#include "../DataStructures/XORFastHash.h"
#include "../Util/OpenMPReplacement.h"
#include "../Util/StringUtil.h"
#include <valgrind/callgrind.h>
class Contractor {
private:
@@ -96,26 +94,6 @@ private:
}
};
class XORFastHash {
std::vector<unsigned char> table1;
std::vector<unsigned char> table2;
public:
XORFastHash() {
table1.resize(1 << 16);
table2.resize(1 << 16);
for(unsigned i = 0; i < (1 << 16); ++i) {
table1[i] = i; table2[i];
}
std::random_shuffle(table1.begin(), table1.end());
std::random_shuffle(table2.begin(), table2.end());
}
unsigned short operator()(const unsigned originalValue) const {
unsigned short lsb = ((originalValue-1) & 0xffff);
unsigned short msb = (((originalValue-1) >> 16) & 0xffff);
return table1[lsb] ^ table2[msb];
}
};
public:
template<class ContainerT >
@@ -227,7 +205,6 @@ public:
}
void Run() {
CALLGRIND_START_INSTRUMENTATION;
const NodeID numberOfNodes = _graph->GetNumberOfNodes();
Percent p (numberOfNodes);
@@ -446,7 +423,6 @@ public:
p.printStatus(numberOfContractedNodes);
}
CALLGRIND_STOP_INSTRUMENTATION;
for ( unsigned threadNum = 0; threadNum < maxThreads; threadNum++ ) {
delete threadData[threadNum];
}
@@ -562,18 +538,18 @@ private:
}
}
double _Evaluate( _ThreadData* const data, _PriorityData* const nodeData, NodeID node){
float _Evaluate( _ThreadData* const data, _PriorityData* const nodeData, NodeID node){
_ContractionInformation stats;
//perform simulated contraction
_Contract< true> ( data, node, &stats );
// Result will contain the priority
double result;
float result;
if ( stats.edgesDeleted == 0 || stats.originalEdgesDeleted == 0 )
result = 1 * nodeData->depth;
else
result = 2 * ((( double ) stats.edgesAdded ) / stats.edgesDeleted ) + 4 * ((( double ) stats.originalEdgesAdded ) / stats.originalEdgesDeleted ) + 1 * nodeData->depth;
result = 2 * ((( float ) stats.edgesAdded ) / stats.edgesDeleted ) + 4 * ((( float ) stats.originalEdgesAdded ) / stats.originalEdgesDeleted ) + 1 * nodeData->depth;
assert( result >= 0 );
return result;
}
@@ -763,21 +739,21 @@ private:
}
}
}
return true;
}
inline bool bias(const NodeID a, const NodeID b) {
/**
* This bias function takes up 22 assembly instructions in total on X86
*/
inline bool bias(const NodeID a, const NodeID b) const {
unsigned short hasha = fastHash(a);
unsigned short hashb = fastHash(b);
//Decision with branching
// if(hasha != hashb)
// return hasha < hashb;
// return a < b;
//Decision without branching
return (hasha < hashb)+((hasha==hashb)*(a<b));
//The compiler optimizes that to conditional register flags but without branching statements!
if(hasha != hashb)
return hasha < hashb;
return a < b;
}
boost::shared_ptr<_DynamicGraph> _graph;