Commit 181ec19d authored by rosemaryng's avatar rosemaryng
Browse files

[Ding] Fixed System renenging and balking rate bug by adding S_BR & S_RR to...

[Ding] Fixed System renenging and balking rate bug by adding S_BR & S_RR to isGlobalMeasure() in CommonModel
parent f40c9f46
......@@ -2593,7 +2593,8 @@ public class CommonModel implements CommonConstants, ClassDefinition, StationDef
@Override
public boolean isGlobalMeasure(String type) {
return type.equals(MEASURE_S_X) || type.equals(MEASURE_S_RP) || type.equals(MEASURE_S_CN)
|| type.equals(MEASURE_S_DR) || type.equals(MEASURE_S_P) || type.equals(MEASURE_S_R);
|| type.equals(MEASURE_S_DR) || type.equals(MEASURE_S_P) || type.equals(MEASURE_S_R)
|| type.equals(MEASURE_S_RR) || type.equals(MEASURE_S_BR);
}
/**
......
......@@ -221,9 +221,9 @@ public class PAResultsWindow extends JMTFrame implements ResultsConstants, Param
} else if (measureType.equals(SimulationDefinition.MEASURE_X) || measureType.equals(SimulationDefinition.MEASURE_DR)
|| measureType.equals(SimulationDefinition.MEASURE_S_X) || measureType.equals(SimulationDefinition.MEASURE_S_DR)
|| measureType.equals(SimulationDefinition.MEASURE_X_PER_SINK) || measureType.equals(SimulationDefinition.MEASURE_S_R)
|| measureType.equals(SimulationDefinition.MEASURE_R) || measureType.equals(SimulationDefinition.MEASURE_RR)
|| measureType.equals(SimulationDefinition.MEASURE_BR) || measureType.equals(SimulationDefinition.MEASURE_S_RR)
|| measureType.equals(SimulationDefinition.MEASURE_S_BR)) {
|| measureType.equals(SimulationDefinition.MEASURE_R) || measureType.equals(SimulationDefinition.MEASURE_RR)
|| measureType.equals(SimulationDefinition.MEASURE_BR) || measureType.equals(SimulationDefinition.MEASURE_S_RR)
|| measureType.equals(SimulationDefinition.MEASURE_S_BR)) {
suffix = " (j/s)";
} else if (measureType.equals(SimulationDefinition.MEASURE_S_P)) {
suffix = " (j/s^2)";
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment