From 4f1e49777ac2acd96f2647f4b0de8d04d5459ba2 Mon Sep 17 00:00:00 2001 From: Andy Baxter Date: Wed, 6 Aug 2025 17:00:01 +0100 Subject: [PATCH 1/7] put country setters in right places --- src/main/java/simpaths/experiment/SimPathsMultiRun.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/simpaths/experiment/SimPathsMultiRun.java b/src/main/java/simpaths/experiment/SimPathsMultiRun.java index 391f33d24..d8991d34f 100644 --- a/src/main/java/simpaths/experiment/SimPathsMultiRun.java +++ b/src/main/java/simpaths/experiment/SimPathsMultiRun.java @@ -85,15 +85,16 @@ public static void main(String[] args) { } else { countryString = "United Kingdom"; } + country = Country.getCountryFromNameString(countryString); String valueYear = lastDatabaseCountryAndYear.getValue(country.toString()).toString(); startYear = Integer.parseInt(valueYear); } catch (NullPointerException e) { System.out.println("No last database country and year found."); countryString = "United Kingdom"; + country = Country.getCountryFromNameString(countryString); startYear = 2019; } - country = Country.getCountryFromNameString(countryString); if (innovationArgs!=null) updateLocalParameters(innovationArgs); From 22496b0e239a9742ebd2aa43b8b34e8a1d61a00d Mon Sep 17 00:00:00 2001 From: pbronka <56582427+pbronka@users.noreply.github.com> Date: Tue, 12 Aug 2025 18:10:54 +0100 Subject: [PATCH 2/7] Create publish-javadoc.yml Create workflow for automatic documentation creation and deployment on push to develop branch --- .github/workflows/publish-javadoc.yml | 38 +++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 .github/workflows/publish-javadoc.yml diff --git a/.github/workflows/publish-javadoc.yml b/.github/workflows/publish-javadoc.yml new file mode 100644 index 000000000..ca559d589 --- /dev/null +++ b/.github/workflows/publish-javadoc.yml @@ -0,0 +1,38 @@ +name: Publish Javadoc + +on: + push: + branches: + - develop # Only publish when pushing to develop branch + +jobs: + publish-javadoc: + runs-on: ubuntu-latest + permissions: + contents: write # Needed to push to the javadoc branch + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Set up JDK 19 + uses: actions/setup-java@v3 + with: + java-version: '19' + distribution: 'temurin' + cache: maven + + - name: Build (optional if Javadoc needs compiled sources) + run: mvn -B compile --file pom.xml + + - name: Generate Javadoc + run: mvn javadoc:javadoc --file pom.xml + + - name: Deploy Javadoc to branch + uses: MathieuSoysal/Javadoc-publisher.yml@v3.0.2 + with: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + javadoc-branch: javadoc # Branch to store Javadoc + java-version: 19 + target-folder: target/site/apidocs # Javadoc output directory + project: maven From ad5cc8947b81cdb38bf96674daabdc0293a66f28 Mon Sep 17 00:00:00 2001 From: pbronka <56582427+pbronka@users.noreply.github.com> Date: Tue, 12 Aug 2025 18:32:45 +0100 Subject: [PATCH 3/7] Javadoc changes required to remove errors thrown by the javadoc workflow action --- src/main/java/simpaths/data/CallEMLight.java | 2 +- src/main/java/simpaths/data/CallEUROMOD.java | 2 +- src/main/java/simpaths/data/ScenarioTable.java | 1 - .../java/simpaths/model/taxes/database/TaxDonorDataParser.java | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/simpaths/data/CallEMLight.java b/src/main/java/simpaths/data/CallEMLight.java index 82a93600b..1a967fb1a 100644 --- a/src/main/java/simpaths/data/CallEMLight.java +++ b/src/main/java/simpaths/data/CallEMLight.java @@ -10,7 +10,7 @@ public class CallEMLight { //------------------------------------------------------------------------------------------------------------- /** - * CALLING EUROMOD LIGHT IN THIS SIMULATION RUN TO GIVE THE USER THE OPPORTUNITY TO CREATE EUROMOD OUTPUT POPULATION from which to generate population of households and persons after tax & benefit treatment + * CALLING EUROMOD LIGHT IN THIS SIMULATION RUN TO GIVE THE USER THE OPPORTUNITY TO CREATE EUROMOD OUTPUT POPULATION from which to generate population of households and persons after tax and benefit treatment **/ //------------------------------------------------------------------------------------------------------------- diff --git a/src/main/java/simpaths/data/CallEUROMOD.java b/src/main/java/simpaths/data/CallEUROMOD.java index bcab8aee9..5e73c924c 100644 --- a/src/main/java/simpaths/data/CallEUROMOD.java +++ b/src/main/java/simpaths/data/CallEUROMOD.java @@ -11,7 +11,7 @@ public class CallEUROMOD { //------------------------------------------------------------------------------------------------------------- /** - * CALLING EUROMOD IN THIS SIMULATION RUN TO GIVE THE USER THE OPPORTUNITY TO CREATE EUROMOD OUTPUT POPULATION from which to generate population of households and persons after tax & benefit treatment + * CALLING EUROMOD IN THIS SIMULATION RUN TO GIVE THE USER THE OPPORTUNITY TO CREATE EUROMOD OUTPUT POPULATION from which to generate population of households and persons after tax and benefit treatment **/ //------------------------------------------------------------------------------------------------------------- public static void run() { diff --git a/src/main/java/simpaths/data/ScenarioTable.java b/src/main/java/simpaths/data/ScenarioTable.java index fdcc91c25..e3247871d 100644 --- a/src/main/java/simpaths/data/ScenarioTable.java +++ b/src/main/java/simpaths/data/ScenarioTable.java @@ -28,7 +28,6 @@ public class ScenarioTable extends JPanel implements ActionListener { /** * * CONSTRUCTOR TO INITIATE TABLE - * @param title * @param columnNames * @param data * diff --git a/src/main/java/simpaths/model/taxes/database/TaxDonorDataParser.java b/src/main/java/simpaths/model/taxes/database/TaxDonorDataParser.java index 58ae755bc..042caa16f 100644 --- a/src/main/java/simpaths/model/taxes/database/TaxDonorDataParser.java +++ b/src/main/java/simpaths/model/taxes/database/TaxDonorDataParser.java @@ -421,7 +421,6 @@ public static String stringAppender(Collection strings) { * output .txt files, picking up the relevant columns for each EUROMOD policy scenario, that * will eventually be parsed into the JAS-mine input database. * - * @return The name of the created CSV file (without the .csv extension) * */ public static void constructAggregateTaxDonorPopulationCSVfile(Country country, boolean showGui) { From 97d406f14ab7cb884f4a88f6eba94b9f9e501aa6 Mon Sep 17 00:00:00 2001 From: pbronka <56582427+pbronka@users.noreply.github.com> Date: Tue, 12 Aug 2025 18:36:16 +0100 Subject: [PATCH 4/7] Update Javadoc --- .../simpaths/model/taxes/database/TaxDonorDataParser.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/simpaths/model/taxes/database/TaxDonorDataParser.java b/src/main/java/simpaths/model/taxes/database/TaxDonorDataParser.java index 042caa16f..9dcf889fc 100644 --- a/src/main/java/simpaths/model/taxes/database/TaxDonorDataParser.java +++ b/src/main/java/simpaths/model/taxes/database/TaxDonorDataParser.java @@ -28,8 +28,8 @@ /** * * CLASS TO MANAGE TRANSLATION OF CSV DATA FROM EUROMOD TO DATABASE FOR DONORS USED TO IMPUTE TAX AND BENEFIT PAYMENTS - * csv data are processed and saved to the DONORPERSON_ table in the relational database. These data - * are used as working variables to construct the DONORTAXUNIT_ table, which is then used exclusively \ + * csv data are processed and saved to the DONORPERSON_country code table in the relational database. These data + * are used as working variables to construct the DONORTAXUNIT_country code table, which is then used exclusively \ * for imputing tax and benefit payments, drawing heavily on SQL calls made via Hibernate * */ From ef866498416f391ea0cda0ea1a15657823d97723 Mon Sep 17 00:00:00 2001 From: pbronka <56582427+pbronka@users.noreply.github.com> Date: Tue, 12 Aug 2025 18:52:10 +0100 Subject: [PATCH 5/7] Update publish-javadoc.yml --- .github/workflows/publish-javadoc.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-javadoc.yml b/.github/workflows/publish-javadoc.yml index ca559d589..a781729af 100644 --- a/.github/workflows/publish-javadoc.yml +++ b/.github/workflows/publish-javadoc.yml @@ -28,11 +28,17 @@ jobs: - name: Generate Javadoc run: mvn javadoc:javadoc --file pom.xml + - name: Flatten Javadoc to temp directory + run: | + mkdir javadoc-temp + cp -r target/site/apidocs/* javadoc-temp/ + - name: Deploy Javadoc to branch uses: MathieuSoysal/Javadoc-publisher.yml@v3.0.2 with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - javadoc-branch: javadoc # Branch to store Javadoc + javadoc-branch: javadoc java-version: 19 - target-folder: target/site/apidocs # Javadoc output directory + target-folder: javadoc-temp project: maven + From c7e553c96fe33a8751add82f61197b9544b51fa6 Mon Sep 17 00:00:00 2001 From: pbronka <56582427+pbronka@users.noreply.github.com> Date: Tue, 12 Aug 2025 18:56:13 +0100 Subject: [PATCH 6/7] Update publish-javadoc.yml --- .github/workflows/publish-javadoc.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/publish-javadoc.yml b/.github/workflows/publish-javadoc.yml index a781729af..f9e1c8f2c 100644 --- a/.github/workflows/publish-javadoc.yml +++ b/.github/workflows/publish-javadoc.yml @@ -28,17 +28,12 @@ jobs: - name: Generate Javadoc run: mvn javadoc:javadoc --file pom.xml - - name: Flatten Javadoc to temp directory - run: | - mkdir javadoc-temp - cp -r target/site/apidocs/* javadoc-temp/ - - name: Deploy Javadoc to branch uses: MathieuSoysal/Javadoc-publisher.yml@v3.0.2 with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} javadoc-branch: javadoc java-version: 19 - target-folder: javadoc-temp + target-folder: javadoc project: maven From d4396ee5dd75e7694050c91381609379fcf9893e Mon Sep 17 00:00:00 2001 From: Andy Baxter Date: Tue, 9 Sep 2025 17:10:30 +0100 Subject: [PATCH 7/7] change persist option --- src/main/java/simpaths/experiment/SimPathsMultiRun.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/simpaths/experiment/SimPathsMultiRun.java b/src/main/java/simpaths/experiment/SimPathsMultiRun.java index d8991d34f..43da5317c 100644 --- a/src/main/java/simpaths/experiment/SimPathsMultiRun.java +++ b/src/main/java/simpaths/experiment/SimPathsMultiRun.java @@ -179,7 +179,7 @@ private static boolean parseCommandLineArgs(String[] args) { "\n - root: persist to root output folder (input/)" + "\n - run: persist to run output folder (output/[yyyymmdd_seed]/input/)" + "\n - none: do not write/read processed dataset.\n" + - "(default: `run` - multirun copy in output folder)"); + "(default: `root` - persist to root folder for further runs)"); persistRoot.setArgName("persist"); options.addOption(persistRoot); @@ -242,9 +242,9 @@ private static boolean parseCommandLineArgs(String[] args) { persist_root = false; break; default: - System.out.println("Persist option `" + cmd.getOptionValue("P") + "` not recognised. Valid values: `none`, `root`, `run`. Persisting processed data to run folder"); + System.out.println("Persist option `" + cmd.getOptionValue("P") + "` not recognised. Valid values: `none`, `root`, `run`. Persisting processed data to root folder"); persist_population = true; - persist_root = false; + persist_root = true; } if (cmd.hasOption("f")) {