Merge branch 'devel_anabatic' of ssh://bop-t/users/largo2/git/coriolis into devel_anabatic
This commit is contained in:
commit
faf9688165
|
@ -1372,6 +1372,8 @@ namespace Anabatic {
|
||||||
|
|
||||||
if (state){
|
if (state){
|
||||||
if (state->isSelfSym()){
|
if (state->isSelfSym()){
|
||||||
|
cdebug_log(112,0) << "void Dijkstra::setAxisTargets (): " << endl;
|
||||||
|
|
||||||
Cell* cell = _anabatic->getCell();
|
Cell* cell = _anabatic->getCell();
|
||||||
_queue.clear();
|
_queue.clear();
|
||||||
GCell* gcell = NULL;
|
GCell* gcell = NULL;
|
||||||
|
@ -1510,8 +1512,9 @@ namespace Anabatic {
|
||||||
|
|
||||||
bool Dijkstra::_propagate ( Flags enabledSides )
|
bool Dijkstra::_propagate ( Flags enabledSides )
|
||||||
{
|
{
|
||||||
cdebug_log(112,1) << "Dijkstra::_propagate() " << _net << endl;
|
cdebug_log(112,1) << "Dijkstra::_propagate() " << _net << endl;
|
||||||
while ( not _queue.empty() ) {
|
while ( not _queue.empty() ) {
|
||||||
|
cdebug_log(111,0) << "Number of targets left: " << _targets.size() << " and needaxis? " << needAxisTarget() << endl;
|
||||||
_queue.dump();
|
_queue.dump();
|
||||||
Vertex* current = _queue.top();
|
Vertex* current = _queue.top();
|
||||||
GCell* gcurrent = current->getGCell();
|
GCell* gcurrent = current->getGCell();
|
||||||
|
@ -1563,7 +1566,6 @@ namespace Anabatic {
|
||||||
}
|
}
|
||||||
///////////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
// if has 2 from, 2 distances to calculate
|
|
||||||
cdebug_log(111,0) << "Calc distance1" << endl;
|
cdebug_log(111,0) << "Calc distance1" << endl;
|
||||||
DbU::Unit distance = _distanceCb( current, vneighbor, edge );
|
DbU::Unit distance = _distanceCb( current, vneighbor, edge );
|
||||||
|
|
||||||
|
@ -1609,9 +1611,11 @@ namespace Anabatic {
|
||||||
, getString(_net).c_str()
|
, getString(_net).c_str()
|
||||||
) << endl;
|
) << endl;
|
||||||
|
|
||||||
|
cdebug_tabw(112, 0) << "Targets are: " << endl;
|
||||||
for ( Vertex* v : _targets ) {
|
for ( Vertex* v : _targets ) {
|
||||||
cdebug_tabw(112, 0) << v << endl;
|
cdebug_tabw(112, 0) << v << endl;
|
||||||
}
|
}
|
||||||
|
cdebug_tabw(112, 0) << "End Targets are." << endl;
|
||||||
|
|
||||||
cdebug_tabw(112,-1);
|
cdebug_tabw(112,-1);
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -2209,62 +2209,58 @@ t3
|
||||||
endstream
|
endstream
|
||||||
endobj
|
endobj
|
||||||
9 0 obj
|
9 0 obj
|
||||||
<</Type/ObjStm/N 200/First 1818/Filter/FlateDecode/Length 3752>>
|
<</Type/ObjStm/N 200/First 1818/Filter/FlateDecode/Length 3750>>
|
||||||
stream
|
stream
|
||||||
xÚÍ\[o7~ϯàcòPyx/Š |