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

im-router-update

Browse source
This commit is contained in:
Arndt 2016-08-05 16:02:13 +02:00
parent cd8082f2b2
commit d277db0bd1
19 changed files with 1506 additions and 903 deletions
Download patch file Download diff file Expand all files Collapse all files

1
brouter-core/src/main/java/btools/router/OsmTrack.java
View file

@ -286,7 +286,6 @@ public final class OsmTrack
public int ascend;
public int plainAscend;
public int cost;
public long arrivaltime;
/**
* writes the track in gpx-format to a file

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

@ -19,13 +19,11 @@ public final class RoutingContext implements DistanceChecker
{
public void setAlternativeIdx( int idx )
{
if ( idx < 0 ) idx = 0;
if ( idx > 3 ) idx = 3;
alternativeIdx = idx;
}
public int getAlternativeIdx()
public int getAlternativeIdx(int min, int max)
{
return alternativeIdx;
return alternativeIdx < min ? min : (alternativeIdx > max ? max : alternativeIdx);
}
public int alternativeIdx = 0;
public String localFunction;
@ -66,6 +64,7 @@ public final class RoutingContext implements DistanceChecker
public double waittimeadjustment;
public double inittimeadjustment;
public double starttimeoffset;
public boolean transitonly;
public void readGlobalConfig( BExpressionContext expctxGlobal )
{
@ -92,6 +91,7 @@ public final class RoutingContext implements DistanceChecker
waittimeadjustment = expctxGlobal.getVariableValue( "waittimeadjustment", 0.9f );
inittimeadjustment = expctxGlobal.getVariableValue( "inittimeadjustment", 0.2f );
starttimeoffset = expctxGlobal.getVariableValue( "starttimeoffset", 0.f );
transitonly = expctxGlobal.getVariableValue( "transitonly", 0.f ) != 0.f;
farTrafficWeight = expctxGlobal.getVariableValue( "farTrafficWeight", 2.f );
nearTrafficWeight = expctxGlobal.getVariableValue( "nearTrafficWeight", 2.f );

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

@ -164,7 +164,7 @@ public class RoutingEngine extends Thread
}
else
{
if ( i == routingContext.getAlternativeIdx() )
if ( i == routingContext.getAlternativeIdx(0,3) )
{
if ( "CSV".equals( System.getProperty( "reportFormat" ) ) )
{