From ed359100ed6b3f9ac6f0247a93892b98d467258d Mon Sep 17 00:00:00 2001 From: Tor-Einar Skog <tor-einar.skog@nibio.no> Date: Wed, 25 Apr 2018 15:10:00 +0200 Subject: [PATCH] Bugfix in logic regarding counting/detecting failed model runs --- .../tasks/RunAllForecastConfigurationsTask.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/no/nibio/vips/logic/scheduling/tasks/RunAllForecastConfigurationsTask.java b/src/main/java/no/nibio/vips/logic/scheduling/tasks/RunAllForecastConfigurationsTask.java index 70d882c8..1a057da4 100755 --- a/src/main/java/no/nibio/vips/logic/scheduling/tasks/RunAllForecastConfigurationsTask.java +++ b/src/main/java/no/nibio/vips/logic/scheduling/tasks/RunAllForecastConfigurationsTask.java @@ -115,20 +115,25 @@ public class RunAllForecastConfigurationsTask extends VipsLogicTask{ ex.getMessage(), SchedulingUtil.MESSAGE_STATUS_DANGER) ); - //System.out.println("Error caught"); - continue; + //System.out.println("########################### Error caught: " + errorMessage); + //System.out.println("numberOfCompletedForecastConfigurations=" + numberOfCompletedForecastConfigurations); + //System.out.println("totalNumberofForecastConfigurations=" + totalNumberofForecastConfigurations); + //continue; } } if(totalNumberofForecastConfigurations > 0) { + noForecastConfigurationsFound = false; double completeness = (double) numberOfCompletedForecastConfigurations/totalNumberofForecastConfigurations; tec.setCompleteness(completeness); } else { noForecastConfigurationsFound = true; + //System.out.println("noForecastConfigurationsFound == true!!"); } + //System.out.println("Current completeness=" + tec.getTaskExecutor().getCompleteness()); } } @@ -138,9 +143,12 @@ public class RunAllForecastConfigurationsTask extends VipsLogicTask{ tec.setCompleteness(1.0); tec.setStatusMessage("No current forecast configurations were found"); } + + //System.out.println("Total completeness=" + tec.getTaskExecutor().getCompleteness()); + if(tec.getTaskExecutor().getCompleteness() != 1.0) { - //System.out.println("Error detected"); + //System.out.println("Error detected, RuntimeException thrown just after this"); tec.setStatusMessage(errorMessage.toString()); throw new RuntimeException(); } -- GitLab