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

performance fix

Browse source
This commit is contained in:
Arndt Brenschede 2018-09-14 13:45:38 +02:00
parent 89b60cc54c
commit 5dcfa91ab9
2 changed files with 6 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
brouter-core/src/main/java/btools/router/KinematicModel.java
View file

@ -11,7 +11,7 @@ import btools.expressions.BExpressionContextNode;
import btools.expressions.BExpressionContextWay;
class KinematicModel extends OsmPathModel
final class KinematicModel extends OsmPathModel
{
public OsmPrePath createPrePath()
{
@ -119,7 +119,11 @@ class KinematicModel extends OsmPathModel
*/
public double getEffectiveSpeedLimit( )
{
return Math.min( getWayMaxspeed(), Math.max( getWayMinspeed(), vmax ) );
// performance related inline coding
double minspeed = getWayMinspeed();
double espeed = minspeed > vmax ? minspeed : vmax;
double maxspeed = getWayMaxspeed();
return maxspeed < espeed ? maxspeed : espeed;
}
/**

64
brouter-core/src/main/java/btools/router/KinematicModelDummy.java
View file

@ -1,64 +0,0 @@
/**
* Container for link between two Osm nodes
*
* @author ab
*/
package btools.router;
import java.util.Map;
import btools.expressions.BExpressionContextNode;
import btools.expressions.BExpressionContextWay;
final class KinematicModelDummy extends KinematicModel
{
public OsmPrePath createPrePath()
{
return null;
}
public OsmPath createPath()
{
return null;
}
public KinematicModelDummy()
{
turnAngleDecayLength = 50.;
f_roll = 232.;
f_air = 0.4;
f_recup = 600.;
p_standby = 250.;
recup_efficiency = 0.7;
totalweight = 1640.;
vmax = 60./ 3.6;
leftWaySpeed = 12.f / 3.6;
rightWaySpeed = 12.f / 3.6;
}
public boolean useNewtonApprox;
// derived values
public double xweight = 1./( 2. * f_air * vmax * vmax * vmax - p_standby );
public double timecost0 = 1./vmax + xweight*(f_roll + f_air*vmax*vmax + p_standby/vmax );
@Override
public void init( BExpressionContextWay expctxWay, BExpressionContextNode expctxNode, Map<String,String> extraParams )
{
}
public float getWayMaxspeed()
{
return 100.f;
}
public float getWayMinspeed()
{
return 0.f;
}
public float getNodeMaxspeed()
{
return 999.f;
}
}