From 3dce696a53b156c05ebd750c5a73404f09be0788 Mon Sep 17 00:00:00 2001 From: Andy Baxter Date: Fri, 30 May 2025 13:15:40 +0100 Subject: [PATCH 1/2] multirun `-DBsetup` option now checks whether training data is used --- src/main/java/simpaths/data/Parameters.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/simpaths/data/Parameters.java b/src/main/java/simpaths/data/Parameters.java index 9815aa3a9..f9f444803 100644 --- a/src/main/java/simpaths/data/Parameters.java +++ b/src/main/java/simpaths/data/Parameters.java @@ -8,6 +8,7 @@ import java.util.*; // import plug-in packages +import org.apache.commons.io.FileUtils; import simpaths.data.startingpop.DataParser; import simpaths.model.AnnuityRates; import simpaths.model.enums.*; @@ -3318,6 +3319,11 @@ public static void databaseSetup(Country country, boolean executeWithGui, int st String filePath = "./input" + File.separator + "input.mv.db"; safeDelete(filePath); + // Detect if data available; set to testing data if not + Collection testList = FileUtils.listFiles(new File(Parameters.getInputDirectoryInitialPopulations()), new String[]{"csv"}, false); + if (testList.size()==0) + Parameters.setTrainingFlag(true); + // populate new database for starting data DataParser.databaseFromCSV(country, executeWithGui); // Initial database tables From a928a2467d409329f7fc541a540c6ded6c3db127 Mon Sep 17 00:00:00 2001 From: Andrew Baxter Date: Fri, 30 May 2025 14:40:20 +0100 Subject: [PATCH 2/2] Update src/main/java/simpaths/data/Parameters.java Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- src/main/java/simpaths/data/Parameters.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/simpaths/data/Parameters.java b/src/main/java/simpaths/data/Parameters.java index f9f444803..70e2fec93 100644 --- a/src/main/java/simpaths/data/Parameters.java +++ b/src/main/java/simpaths/data/Parameters.java @@ -3321,7 +3321,7 @@ public static void databaseSetup(Country country, boolean executeWithGui, int st // Detect if data available; set to testing data if not Collection testList = FileUtils.listFiles(new File(Parameters.getInputDirectoryInitialPopulations()), new String[]{"csv"}, false); - if (testList.size()==0) + if (testList.isEmpty()) Parameters.setTrainingFlag(true); // populate new database for starting data