Fabio/brouter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' of https://github.com/abrensch/brouter

Browse source
This commit is contained in:
Arndt 2016-10-14 19:19:44 +02:00
commit a7e4f0eccb
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
brouter-core/src/main/java/btools/router/RoutingEngine.java
View file

@ -795,6 +795,8 @@ public class RoutingEngine extends Thread
throw new IllegalArgumentException( "operation killed by thread-priority-watchdog after " + ( System.currentTimeMillis() - startTime)/1000 + " seconds" ); throw new IllegalArgumentException( "operation killed by thread-priority-watchdog after " + ( System.currentTimeMillis() - startTime)/1000 + " seconds" );
} }
if ( maxRunningTime > 0 ) if ( maxRunningTime > 0 )
{ {
long timeout = ( matchPath == null && fastPartialRecalc ) ? maxRunningTime/3 : maxRunningTime; long timeout = ( matchPath == null && fastPartialRecalc ) ? maxRunningTime/3 : maxRunningTime;
@ -815,11 +817,21 @@ public class RoutingEngine extends Thread
continue; continue;
} }
if ( matchPath != null && fastPartialRecalc && firstMatchCost < 500 && path.cost > 30L*firstMatchCost if ( fastPartialRecalc && matchPath != null && path.cost > 30L*firstMatchCost && !costCuttingTrack.isDirty )
&& !costCuttingTrack.isDirty )
{ {
logInfo( "early exit: firstMatchCost=" + firstMatchCost + " path.cost=" + path.cost ); logInfo( "early exit: firstMatchCost=" + firstMatchCost + " path.cost=" + path.cost );
throw new IllegalArgumentException( "early exit for a close recalc" );
// use an early exit, unless there's a realistc chance to complete within the timeout
if ( path.cost > maxTotalCost/2 && System.currentTimeMillis() - startTime < maxRunningTime/3 )
{
logInfo( "early exit supressed, running for completion, resetting timeout" );
startTime = System.currentTimeMillis();
fastPartialRecalc = false;
}
else
{
throw new IllegalArgumentException( "early exit for a close recalc" );
}
} }
if ( nodeLimit > 0 ) // check node-limit for target island search if ( nodeLimit > 0 ) // check node-limit for target island search