New DynamicGraph uses less RAM, Monav backport. Thanks

This commit is contained in:
Dennis Luxen 2010-09-13 14:16:07 +00:00
parent 891b068551
commit effee46011

View File

@ -16,56 +16,26 @@ You should have received a copy of the GNU Affero General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
or see http://www.gnu.org/licenses/agpl.txt. or see http://www.gnu.org/licenses/agpl.txt.
*/ */
#ifndef DYNAMICGRAPH_H_INCLUDED #ifndef DYNAMICGRAPH_H_INCLUDED
#define DYNAMICGRAPH_H_INCLUDED #define DYNAMICGRAPH_H_INCLUDED
#include <vector> #include <vector>
#include <algorithm> #include <algorithm>
#include <limits>
#include "../typedefs.h"
// returns the smallest power of two that is at least as large as x
static unsigned log2Rounded32( unsigned x ) {
const unsigned bitPosition[32] = {
0, 1, 28, 2, 29, 14, 24, 3, 30, 22, 20, 15, 25, 17, 4, 8,
31, 27, 13, 23, 21, 19, 16, 7, 26, 12, 18, 6, 11, 5, 10, 9
};
//round up
--x;
x |= x >> 1;
x |= x >> 2;
x |= x >> 4;
x |= x >> 8;
x |= x >> 16;
++x;
//x is now a power of 2
//each power of two is mapped to a unique 5 bit sequence with ( x * 0x077CB531U ) >> 27
return bitPosition[( x * 0x077CB531U ) >> 27];
}
/*
static unsigned log2Rounded64( unsigned long long x ) {
int upperLog = log2Rounded32( x >> 32 );
if ( upperLog > 0 )
return upperLog;
return log2Rounded32( x );
}
*/
template< typename EdgeData> template< typename EdgeData>
class DynamicGraph { class DynamicGraph {
public: public:
typedef NodeID NodeIterator; typedef unsigned NodeIterator;
typedef NodeID EdgeIterator; typedef unsigned EdgeIterator;
class InputEdge { class InputEdge {
public: public:
EdgeData data;
NodeIterator source; NodeIterator source;
NodeIterator target; NodeIterator target;
EdgeData data;
bool operator<( const InputEdge& right ) const { bool operator<( const InputEdge& right ) const {
if ( source != right.source ) if ( source != right.source )
return source < right.source; return source < right.source;
@ -73,157 +43,187 @@ public:
} }
}; };
DynamicGraph( int nodes, std::vector< InputEdge > &graph ) { DynamicGraph( int nodes, const std::vector< InputEdge > &graph )
{
std::sort( graph.begin(), graph.end() ); m_numNodes = nodes;
_numNodes = nodes; m_numEdges = ( EdgeIterator ) graph.size();
_numEdges = ( EdgeIterator ) graph.size(); m_nodes.reserve( m_numNodes );
_nodes.resize( _numNodes ); m_nodes.resize( m_numNodes );
EdgeIterator edge = 0; EdgeIterator edge = 0;
EdgeIterator position = 0; EdgeIterator position = 0;
for ( NodeIterator node = 0; node < _numNodes; ++node ) { for ( NodeIterator node = 0; node < m_numNodes; ++node ) {
EdgeIterator lastEdge = edge; EdgeIterator lastEdge = edge;
while ( edge < _numEdges && graph[edge].source == node ) { while ( edge < m_numEdges && graph[edge].source == node ) {
++edge; ++edge;
} }
_nodes[node].firstEdge = position; m_nodes[node].firstEdge = position;
_nodes[node].edges = edge - lastEdge; m_nodes[node].edges = edge - lastEdge;
_nodes[node].size = 1 << log2Rounded32( edge - lastEdge ); position += m_nodes[node].edges;
position += _nodes[node].size;
} }
_edges.resize( position ); m_edges.reserve( position * 1.2 );
m_edges.resize( position );
edge = 0; edge = 0;
for ( NodeIterator node = 0; node < _numNodes; ++node ) { for ( NodeIterator node = 0; node < m_numNodes; ++node ) {
for ( EdgeIterator i = _nodes[node].firstEdge, e = _nodes[node].firstEdge + _nodes[node].edges; i != e; ++i ) { for ( EdgeIterator i = m_nodes[node].firstEdge, e = m_nodes[node].firstEdge + m_nodes[node].edges; i != e; ++i ) {
_edges[i].target = graph[edge].target; m_edges[i].target = graph[edge].target;
_edges[i].data = graph[edge].data; m_edges[i].data = graph[edge].data;
assert(_edges[i].data.distance > 0);
edge++; edge++;
} }
} }
} }
unsigned GetNumberOfNodes() const { ~DynamicGraph()
return _numNodes; {
} }
unsigned GetNumberOfEdges() const { unsigned GetNumberOfNodes() const
return _numEdges; {
return m_numNodes;
} }
unsigned GetOutDegree( const NodeIterator &n ) const { unsigned GetNumberOfEdges() const
return _nodes[n].edges; {
return m_numEdges;
} }
NodeIterator GetTarget( const EdgeIterator &e ) const { unsigned GetOutDegree( const NodeIterator &n ) const
return NodeIterator( _edges[e].target ); {
return m_nodes[n].edges;
} }
EdgeData &GetEdgeData( const EdgeIterator &e ) { NodeIterator GetTarget( const EdgeIterator &e ) const
return _edges[e].data; {
return NodeIterator( m_edges[e].target );
} }
const EdgeData &GetEdgeData( const EdgeIterator &e ) const { EdgeData &GetEdgeData( const EdgeIterator &e )
return _edges[e].data; {
return m_edges[e].data;
} }
EdgeIterator BeginEdges( const NodeIterator &n ) const { const EdgeData &GetEdgeData( const EdgeIterator &e ) const
{
return m_edges[e].data;
}
EdgeIterator BeginEdges( const NodeIterator &n ) const
{
//assert( EndEdges( n ) - EdgeIterator( _nodes[n].firstEdge ) <= 100 ); //assert( EndEdges( n ) - EdgeIterator( _nodes[n].firstEdge ) <= 100 );
return EdgeIterator( _nodes[n].firstEdge ); return EdgeIterator( m_nodes[n].firstEdge );
} }
EdgeIterator EndEdges( const NodeIterator &n ) const { EdgeIterator EndEdges( const NodeIterator &n ) const
return EdgeIterator( _nodes[n].firstEdge + _nodes[n].edges ); {
return EdgeIterator( m_nodes[n].firstEdge + m_nodes[n].edges );
} }
//adds an edge. Invalidates edge iterators for the source node //adds an edge. Invalidates edge iterators for the source node
EdgeIterator InsertEdge( const NodeIterator &from, const NodeIterator &to, const EdgeData &data ) { EdgeIterator InsertEdge( const NodeIterator &from, const NodeIterator &to, const EdgeData &data )
_StrNode &node = _nodes[from]; {
if ( node.edges + 1 >= node.size ) { Node &node = m_nodes[from];
node.size *= 2; EdgeIterator newFirstEdge = node.edges + node.firstEdge;
EdgeIterator newFirstEdge = ( EdgeIterator ) _edges.size(); if ( newFirstEdge >= m_edges.size() || !isDummy( newFirstEdge ) ) {
_edges.resize( _edges.size() + node.size ); if ( node.firstEdge != 0 && isDummy( node.firstEdge - 1 ) ) {
for ( unsigned i = 0; i < node.edges; ++i ) { node.firstEdge--;
_edges[newFirstEdge + i ] = _edges[node.firstEdge + i]; m_edges[node.firstEdge] = m_edges[node.firstEdge + node.edges];
} else {
EdgeIterator newFirstEdge = ( EdgeIterator ) m_edges.size();
unsigned newSize = node.edges * 1.2 + 2;
EdgeIterator requiredCapacity = newSize + m_edges.size();
EdgeIterator oldCapacity = m_edges.capacity();
if ( requiredCapacity >= oldCapacity ) {
m_edges.reserve( requiredCapacity * 1.1 );
} }
m_edges.resize( m_edges.size() + newSize );
for ( EdgeIterator i = 0; i < node.edges; ++i ) {
m_edges[newFirstEdge + i ] = m_edges[node.firstEdge + i];
makeDummy( node.firstEdge + i );
}
for ( EdgeIterator i = node.edges + 1; i < newSize; i++ )
makeDummy( newFirstEdge + i );
node.firstEdge = newFirstEdge; node.firstEdge = newFirstEdge;
} }
_StrEdge &edge = _edges[node.firstEdge + node.edges]; }
Edge &edge = m_edges[node.firstEdge + node.edges];
edge.target = to; edge.target = to;
edge.data = data; edge.data = data;
_numEdges++; m_numEdges++;
node.edges++; node.edges++;
return EdgeIterator( node.firstEdge + node.edges ); return EdgeIterator( node.firstEdge + node.edges );
} }
//removes an edge. Invalidates edge iterators for the source node //removes an edge. Invalidates edge iterators for the source node
void DeleteEdge( const NodeIterator source, const EdgeIterator &e ) { void DeleteEdge( const NodeIterator source, const EdgeIterator &e ) {
_StrNode &node = _nodes[source]; Node &node = m_nodes[source];
--_numEdges; --m_numEdges;
--node.edges; --node.edges;
const unsigned last = node.firstEdge + node.edges; const unsigned last = node.firstEdge + node.edges;
//swap with last edge //swap with last edge
_edges[e] = _edges[last]; m_edges[e] = m_edges[last];
makeDummy( last );
} }
//removes all edges (source,target) //removes all edges (source,target)
int DeleteEdgesTo( const NodeIterator source, const NodeIterator target ) { int DeleteEdgesTo( const NodeIterator source, const NodeIterator target )
{
int deleted = 0; int deleted = 0;
for ( EdgeIterator i = BeginEdges( source ), iend = EndEdges( source ); i < iend - deleted; ++i ) { for ( EdgeIterator i = BeginEdges( source ), iend = EndEdges( source ); i < iend - deleted; ++i ) {
if ( _edges[i].target == target ) { if ( m_edges[i].target == target ) {
do { do {
deleted++; deleted++;
_edges[i] = _edges[iend - deleted]; m_edges[i] = m_edges[iend - deleted];
} while ( i < iend - deleted && _edges[i].target == target ); makeDummy( iend - deleted );
} while ( i < iend - deleted && m_edges[i].target == target );
} }
} }
#pragma omp atomic #pragma omp atomic
_numEdges -= deleted; m_numEdges -= deleted;
_nodes[source].edges -= deleted; m_nodes[source].edges -= deleted;
return deleted; return deleted;
} }
//searches for a specific edge //searches for a specific edge
EdgeIterator FindEdge( const NodeIterator &from, const NodeIterator &to ) const { EdgeIterator FindEdge( const NodeIterator &from, const NodeIterator &to ) const
EdgeIterator smallestEdge = SPECIAL_EDGEID;
EdgeWeight smallestWeight = UINT_MAX;
for ( EdgeIterator edge = BeginEdges( from ); edge < EndEdges(from); edge++ )
{ {
const NodeID target = GetTarget(edge); for ( EdgeIterator i = BeginEdges( from ), iend = EndEdges( from ); i != iend; ++i ) {
const EdgeWeight weight = GetEdgeData(edge).distance; if ( m_edges[i].target == to ) {
{ return i;
if(target == to && weight < smallestWeight)
{
smallestEdge = edge; smallestWeight = weight;
} }
} }
} return EndEdges( from );
return smallestEdge;
} }
protected:
private: bool isDummy( EdgeIterator edge ) const
{
return m_edges[edge].target == std::numeric_limits< NodeIterator >::max();
}
struct _StrNode { void makeDummy( EdgeIterator edge )
{
m_edges[edge].target = std::numeric_limits< NodeIterator >::max();
}
struct Node {
//index of the first edge //index of the first edge
EdgeIterator firstEdge; EdgeIterator firstEdge;
//amount of edges //amount of edges
unsigned edges; unsigned edges;
unsigned size;
}; };
struct _StrEdge { struct Edge {
NodeID target; NodeIterator target;
EdgeData data; EdgeData data;
}; };
NodeIterator _numNodes; NodeIterator m_numNodes;
EdgeIterator _numEdges; EdgeIterator m_numEdges;
std::vector< _StrNode > _nodes; std::vector< Node > m_nodes;
std::vector< _StrEdge > _edges; std::vector< Edge > m_edges;
}; };
#endif // DYNAMICGRAPH_H_INCLUDED #endif // DYNAMICGRAPH_H_INCLUDED