Skip to content

Allow selection of initial years to not require/read full range from MIN-MAX start years #248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrewbaxter439 merged 3 commits into from
Sep 23, 2025
Merged

Allow selection of initial years to not require/read full range from MIN-MAX start years #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f3ac1a5
allow selection of `includeYears` to read initial populations
andrewbaxter439 Sep 20, 2025
e6d1cd2
adding default value include years as guide/placeholder
andrewbaxter439 Sep 22, 2025
cdee28b
safe skip selected years if training flag on
andrewbaxter439 Sep 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions config/default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,3 +65,17 @@ parameter_args:
# input_directory: input
# input_directory_initial_populations: input/InitialPopulations
# euromod_output_directory: input/EUROMODoutput
# includeYears:
# - 2011
# - 2012
# - 2013
# - 2014
# - 2015
# - 2016
# - 2017
# - 2018
# - 2019
# - 2020
# - 2021
# - 2022
# - 2023
3 changes: 3 additions & 0 deletions config/test_create_database.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@ randomSeed: 606
startYear: 2019
endYear: 2030
popSize: 40000

parameter_args:
trainingFlag: true
1 change: 1 addition & 0 deletions src/main/java/simpaths/data/Parameters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,7 @@ else if(numberOfChildren <= 5) {
public static final int MAX_AGE_MATERNITY = 44; // Max age a person can give birth
public static final boolean FLAG_SINGLE_MOTHERS = true;
public static boolean flagUnemployment = false;
public static ArrayList<Integer> includeYears;
Comment thread
andrewbaxter439 marked this conversation as resolved.

public static int BASE_PRICE_YEAR = 2015; // Base price year of model parameters

Expand Down
25 changes: 18 additions & 7 deletions src/main/java/simpaths/data/startingpop/DataParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,7 @@
import java.sql.DriverManager;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Arrays;
import java.util.Collection;
import java.util.LinkedHashSet;
import java.util.Iterator;
import java.util.Set;
import java.util.*;

import simpaths.data.FormattedDialogBox;
import simpaths.data.Parameters;
Expand All @@ -31,6 +27,17 @@ public static void createDatabaseForPopulationInitialisationByYearFromCSV(Countr
}
}

public static void createDatabaseForPopulationInitialisationByYearFromCSV(Country country, String initialInputFilename, ArrayList<Integer> includeYears, Connection conn) {

Comment thread
andrewbaxter439 marked this conversation as resolved.
//Initialise repository table for country-year-population size combinations
initialiseRepository(conn, includeYears.get(0));

//Construct tables for Simulated Persons & Households (initial population)
for (Integer year: includeYears) {
DataParser.parse(Parameters.getInputDirectoryInitialPopulations() + initialInputFilename + "_" + year + ".csv", initialInputFilename, conn, country, year);
}
}

private static void initialiseRepository(Connection conn, int startYear) {

Statement stat = null;
Expand Down Expand Up @@ -425,8 +432,12 @@ public static void databaseFromCSV(Country country, boolean showGui) {

Parameters.setPopulationInitialisationInputFileName("population_initial_" + country.toString());

//This calls a method creating both the donor population tables and initial populations for every year between minStartYear and maxStartYear.
DataParser.createDatabaseForPopulationInitialisationByYearFromCSV(country, Parameters.getPopulationInitialisationInputFileName(), Parameters.getMinStartYear(), Parameters.getMaxStartYear(), conn);
if (null == Parameters.includeYears || Parameters.trainingFlag) {
//This calls a method creating both the donor population tables and initial populations for every year between minStartYear and maxStartYear.
DataParser.createDatabaseForPopulationInitialisationByYearFromCSV(country, Parameters.getPopulationInitialisationInputFileName(), Parameters.getMinStartYear(), Parameters.getMaxStartYear(), conn);
} else {
DataParser.createDatabaseForPopulationInitialisationByYearFromCSV(country, Parameters.getPopulationInitialisationInputFileName(), Parameters.includeYears, conn);
}

conn.close();
}
Expand Down