Remove GUARANTEE macro

This commit is contained in:
Dennis Luxen 2013-06-24 16:55:43 -04:00
parent a31992aac7
commit 2b0590f9bd

View File

@ -55,8 +55,7 @@ class DynamicGraph {
m_edges.resize( m_numNodes ); m_edges.resize( m_numNodes );
} }
template<class ContainerT> template<class ContainerT>
DynamicGraph( const int nodes, const ContainerT &graph ) DynamicGraph( const int nodes, const ContainerT &graph ) {
{
m_numNodes = nodes; m_numNodes = nodes;
m_numEdges = ( EdgeIterator ) graph.size(); m_numEdges = ( EdgeIterator ) graph.size();
m_nodes.reserve( m_numNodes +1); m_nodes.reserve( m_numNodes +1);
@ -80,7 +79,10 @@ class DynamicGraph {
for ( EdgeIterator i = m_nodes[node].firstEdge, e = m_nodes[node].firstEdge + m_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 ) {
m_edges[i].target = graph[edge].target; m_edges[i].target = graph[edge].target;
m_edges[i].data = graph[edge].data; m_edges[i].data = graph[edge].data;
GUARANTEE(graph[edge].data.distance > 0, "edge: " << edge << "(" << graph[edge].source << "," << graph[edge].target << ")=" << graph[edge].data.distance); BOOST_ASSERT_MSG(
graph[edge].data.distance > 0,
"edge distance invalid"
);
++edge; ++edge;
} }
} }
@ -88,13 +90,11 @@ class DynamicGraph {
~DynamicGraph(){ } ~DynamicGraph(){ }
unsigned GetNumberOfNodes() const unsigned GetNumberOfNodes() const {
{
return m_numNodes; return m_numNodes;
} }
unsigned GetNumberOfEdges() const unsigned GetNumberOfEdges() const {
{
return m_numEdges; return m_numEdges;
} }