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

explicit classifier for initial cost

Browse source
This commit is contained in:
Arndt 2015-04-03 13:39:38 +02:00
parent 3ed62bb2b3
commit 0316c41924
4 changed files with 25 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
brouter-expressions/src/main/java/btools/expressions/BExpression.java
View file

@ -11,6 +11,7 @@ final class BExpression
private static final int ADD_EXP = 20;
private static final int MULTIPLY_EXP = 21;
private static final int MAX_EXP = 22;
private static final int EQUAL_EXP = 23;
private static final int SWITCH_EXP = 30;
private static final int ASSIGN_EXP = 31;
@ -100,6 +101,10 @@ final class BExpression
{
exp.typ = MAX_EXP;
}
else if ( "equal".equals( operator ) )
{
exp.typ = EQUAL_EXP;
}
else
{
nops = 1; // check unary expressions
@ -220,6 +225,7 @@ final class BExpression
case ADD_EXP: return op1.evaluate(ctx) + op2.evaluate(ctx);
case MULTIPLY_EXP: return op1.evaluate(ctx) * op2.evaluate(ctx);
case MAX_EXP: return max( op1.evaluate(ctx), op2.evaluate(ctx) );
case EQUAL_EXP: return op1.evaluate(ctx) == op2.evaluate(ctx) ? 1.f : 0.f;
case SWITCH_EXP: return op1.evaluate(ctx) != 0.f ? op2.evaluate(ctx) : op3.evaluate(ctx);
case ASSIGN_EXP: return ctx.assign( variableIdx, op1.evaluate(ctx) );
case LOOKUP_EXP: return ctx.getLookupMatch( lookupNameIdx, lookupValueIdxArray );

10
brouter-expressions/src/main/java/btools/expressions/BExpressionContext.java
View file

@ -399,7 +399,8 @@ public abstract class BExpressionContext
for( int vi=0; vi<buildInVariableIdx.length; vi++ )
{
arrayBuildInVariablesCache[vi][currentHashBucket] = variableData[buildInVariableIdx[vi]];
int idx = buildInVariableIdx[vi];
arrayBuildInVariablesCache[vi][currentHashBucket] = idx == -1 ? 0.f : variableData[idx];
}
_receiver = null;
@ -658,15 +659,16 @@ public abstract class BExpressionContext
linenr = 1;
minWriteIdx = variableData == null ? 0 : variableData.length;
// create the build-in variables
expressionList = _parseFile( file );
// determine the build-in variable indices
String[] varNames = getBuildInVariableNames();
buildInVariableIdx = new int[varNames.length];
for( int vi=0; vi<varNames.length; vi++ )
{
buildInVariableIdx[vi] = getVariableIdx( varNames[vi], true );
buildInVariableIdx[vi] = getVariableIdx( varNames[vi], false );
}
expressionList = _parseFile( file );
float[] readOnlyData = variableData;
variableData = new float[variableNumbers.size()];
for( int i=0; i<minWriteIdx; i++ )

3
brouter-expressions/src/main/java/btools/expressions/BExpressionContextWay.java
View file

@ -11,7 +11,7 @@ package btools.expressions;
public final class BExpressionContextWay extends BExpressionContext
{
private static String[] buildInVariables =
{ "costfactor", "turncost", "uphillcostfactor", "downhillcostfactor", "initialcost", "nodeaccessgranted" };
{ "costfactor", "turncost", "uphillcostfactor", "downhillcostfactor", "initialcost", "nodeaccessgranted", "initialclassifier" };
protected String[] getBuildInVariableNames()
{
@ -24,6 +24,7 @@ public final class BExpressionContextWay extends BExpressionContext
public float getDownhillCostfactor() { return getBuildInVariable(3); }
public float getInitialcost() { return getBuildInVariable(4); }
public float getNodeAccessGranted() { return getBuildInVariable(5); }
public float getInitialClassifier() { return getBuildInVariable(6); }
public BExpressionContextWay( BExpressionMetaData meta )