From ace9a194f9ed299f38994cd6e6843ed4ed32aebe Mon Sep 17 00:00:00 2001 From: Vlad_kv Date: Sun, 11 Aug 2019 16:19:15 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=B2=20=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D0=BF=D1=80=D0=B8=D1=82?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D0=B8=20=D1=80=D0=B5=D0=B7=D1=83=D0=BB=D1=8C?= =?UTF-8?q?=D1=82=D0=B0=D1=82=D0=BE=D0=B2.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/inport/ConversionUtils/MZnResultsResolver.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/inport/ConversionUtils/MZnResultsResolver.java b/src/inport/ConversionUtils/MZnResultsResolver.java index b30741a..c18f89c 100644 --- a/src/inport/ConversionUtils/MZnResultsResolver.java +++ b/src/inport/ConversionUtils/MZnResultsResolver.java @@ -42,6 +42,9 @@ public class MZnResultsResolver { while ((pos < line.length()) && (line.charAt(pos) != '[') && (line.charAt(pos) != '{')) { pos++; } + if (pos == line.length()) { + return null; + } int arrayFirstDim = ((int) taskCase.getPlanningInterval()) + 2; if (line.charAt(pos) == '{') { @@ -254,7 +257,11 @@ public class MZnResultsResolver { } 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); -- GitLab