Commit ace9a194 authored by Vladislav Kiselev's avatar Vladislav Kiselev

Исправлены ошибки в интерпритации результатов.

parent f79be9ee
...@@ -42,6 +42,9 @@ public class MZnResultsResolver { ...@@ -42,6 +42,9 @@ public class MZnResultsResolver {
while ((pos < line.length()) && (line.charAt(pos) != '[') && (line.charAt(pos) != '{')) { while ((pos < line.length()) && (line.charAt(pos) != '[') && (line.charAt(pos) != '{')) {
pos++; pos++;
} }
if (pos == line.length()) {
return null;
}
int arrayFirstDim = ((int) taskCase.getPlanningInterval()) + 2; int arrayFirstDim = ((int) taskCase.getPlanningInterval()) + 2;
if (line.charAt(pos) == '{') { if (line.charAt(pos) == '{') {
...@@ -254,7 +257,11 @@ public class MZnResultsResolver { ...@@ -254,7 +257,11 @@ public class MZnResultsResolver {
} }
if (! cargoOpIntensity.get(opNo).get(t - 1).equals("0")) { if (! cargoOpIntensity.get(opNo).get(t - 1).equals("0")) {
op.setIntensity(Optional.of(Math.abs(Integer.valueOf(cargoOpIntensity.get(opNo).get(t - 1))))); int intensity = Integer.valueOf(cargoOpIntensity.get(opNo).get(t - 1));
if (((LoadingTemplate)op.getTemplate()).getIntensity() < 0) {
intensity *= -1;
}
op.setIntensity(Optional.of(intensity));
} }
op.setFixation(true); op.setFixation(true);
......
Markdown is supported
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