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

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++ )