Update structures for UC implementation

.gitignore

@@ -87,6 +87,8 @@ $RECYCLE.BIN/
 input/input.h2.db
 input/input.trace.db
 /input/input.mv.db
+/input_full/
+/input_temp/
 src/main/resources/log4j/log.out
 
 
@@ -141,6 +143,108 @@ input/EUROMODoutput/baseline/*
 .Rproj.user
 /input/EUROMODoutput/test
 /input/InitialPopulations/test
+input/EUROMODoutput/expanded/uk_2011_std.txt
+input/EUROMODoutput/expanded/uk_2012_std.txt
+input/EUROMODoutput/expanded/uk_2013_std.txt
+input/EUROMODoutput/expanded/uk_2014_std.txt
+input/EUROMODoutput/expanded/uk_2015_std.txt
+input/EUROMODoutput/expanded/uk_2016_std.txt
+input/EUROMODoutput/expanded/uk_2017_std.txt
+input/EUROMODoutput/expanded/uk_2018_std.txt
+input/EUROMODoutput/expanded/uk_2019_std.txt
+input/EUROMODoutput/expanded/uk_2020_std.txt
+input/EUROMODoutput/expanded/uk_2021_std.txt
+input/EUROMODoutput/expanded/uk_2022_std.txt
+input/EUROMODoutput/expanded/uk_2023_std.txt
+input/EUROMODoutput/expanded/uk_2024_std.txt
+input/EUROMODoutput/expanded/uk_2025_std.txt
+input/EUROMODoutput/expanded/uk_2026_std.txt
+input/EUROMODoutput/expanded/uk_2027_std.txt
+input/EUROMODoutput/initial/uk_2011_std.txt
+input/EUROMODoutput/initial/uk_2012_std.txt
+input/EUROMODoutput/initial/uk_2013_std.txt
+input/EUROMODoutput/initial/uk_2014_std.txt
+input/EUROMODoutput/initial/uk_2015_std.txt
+input/EUROMODoutput/initial/uk_2016_std.txt
+input/EUROMODoutput/initial/uk_2017_std.txt
+input/EUROMODoutput/initial/uk_2018_std.txt
+input/EUROMODoutput/initial/uk_2019_std.txt
+input/EUROMODoutput/initial/uk_2020_std.txt
+input/EUROMODoutput/initial/uk_2021_std.txt
+input/EUROMODoutput/initial/uk_2022_std.txt
+input/EUROMODoutput/initial/uk_2023_std.txt
+input/EUROMODoutput/initial/uk_2024_std.txt
+input/EUROMODoutput/initial/uk_2025_std.txt
+input/EUROMODoutput/initial/uk_2026_std.txt
+input/EUROMODoutput/initial/uk_2027_std.txt
+input/EUROMODoutput/testing/uk_2015_std.txt
+input/EUROMODoutput/testing/uk_2019_std.txt
+input/InitialPopulations/current/population_initial_UK_2011.csv
+input/InitialPopulations/current/population_initial_UK_2012.csv
+input/InitialPopulations/current/population_initial_UK_2013.csv
+input/InitialPopulations/current/population_initial_UK_2014.csv
+input/InitialPopulations/current/population_initial_UK_2015.csv
+input/InitialPopulations/current/population_initial_UK_2016.csv
+input/InitialPopulations/current/population_initial_UK_2017.csv
+input/InitialPopulations/current/population_initial_UK_2018.csv
+input/InitialPopulations/current/population_initial_UK_2019.csv
+input/InitialPopulations/current/population_initial_UK_2020.csv
+input/InitialPopulations/current/population_initial_UK_2021.csv
+input/InitialPopulations/testing/population_initial_UK_2019.csv
+input/EUROMODoutput/testing/uk_2015_std.txt
+input/EUROMODoutput/testing/uk_2019_std.txt
+input/EUROMODoutput/extended/uk_2015_std.txt
+input/EUROMODoutput/extended/uk_2019_std.txt
+input/EUROMODoutput/extended/uk_2020_std.txt
+input/EUROMODoutput/extended/uk_2021_std.txt
+input/EUROMODoutput/extended/uk_2022_std.txt
+input/EUROMODoutput/extended/uk_2023_std.txt
+input/EUROMODoutput/extended/uk_2024_std.txt
+input/EUROMODoutput/extended/uk_2025_std.txt
+input/EUROMODoutput/testing/DatabaseCountryYear.xlsx
+input/EUROMODoutput/testing/EUROMODpolicySchedule.xlsx
+input/EUROMODoutput/sc expanded/uk_2011_std.txt
+input/EUROMODoutput/sc expanded/uk_2012_std.txt
+input/EUROMODoutput/sc expanded/uk_2013_std.txt
+input/EUROMODoutput/sc expanded/uk_2014_std.txt
+input/EUROMODoutput/sc expanded/uk_2015_std.txt
+input/EUROMODoutput/sc expanded/uk_2016_std.txt
+input/EUROMODoutput/sc expanded/uk_2017_std.txt
+input/EUROMODoutput/sc expanded/uk_2018_std.txt
+input/EUROMODoutput/sc expanded/uk_2019_std.txt
+input/EUROMODoutput/sc expanded/uk_2020_std.txt
+input/EUROMODoutput/sc expanded/uk_2021_std.txt
+input/EUROMODoutput/sc expanded/uk_2022_std.txt
+input/EUROMODoutput/sc expanded/uk_2023_std.txt
+input/EUROMODoutput/sc expanded/uk_2024_std.txt
+input/EUROMODoutput/sc expanded/uk_2025_std.txt
+input/EUROMODoutput/sc expanded/uk_2026_std.txt
+input/EUROMODoutput/sc expanded/uk_2027_std.txt
+input/EUROMODoutput/current/DatabaseCountryYear.xlsx
+input/EUROMODoutput/current/EUROMODpolicySchedule.xlsx
+input/EUROMODoutput/current/uk_2011_std.txt
+input/EUROMODoutput/current/uk_2012_std.txt
+input/EUROMODoutput/current/uk_2013_std.txt
+input/EUROMODoutput/current/uk_2014_std.txt
+input/EUROMODoutput/current/uk_2015_std.txt
+input/EUROMODoutput/current/uk_2016_std.txt
+input/EUROMODoutput/current/uk_2017_std.txt
+input/EUROMODoutput/current/uk_2018_std.txt
+input/EUROMODoutput/current/uk_2019_std.txt
+input/EUROMODoutput/current/uk_2020_std.txt
+input/EUROMODoutput/current/uk_2021_std.txt
+input/EUROMODoutput/current/uk_2022_std.txt
+input/EUROMODoutput/current/uk_2023_std.txt
+input/EUROMODoutput/current/uk_2024_std.txt
+input/EUROMODoutput/current/uk_2025_std.txt
+input/EUROMODoutput/current/uk_2026_std.txt
+input/EUROMODoutput/current/uk_2027_std.txt
+input/InitialPopulations/current/*
+input/InitialPopulations/testing/*
+input/EUROMODoutput/working/*
+.Rproj.user
+
+input/DatabaseCountryYear.xlsx
 
 # macOS
 .DS_Store

config/lba_test.yml

@@ -0,0 +1,70 @@
+# This file can be used to override defaults for multirun arguments.
+# Arguments of the SimPathsMultiRun object overridden by the command-line
+
+maxNumberOfRuns: 1
+countryString: "United Kingdom"
+executeWithGui: false
+startYear: 2015
+endYear: 2035
+popSize: 200000
+persistCountryYear: false
+
+# Arguments passed to the SimPathsModel
+model_args:
+#    maxAge: 130
+#    fixTimeTrend: true
+#    timeTrendStopsIn: 2017
+#    fixRandomSeed: true
+#    sIndexTimeWindow: 5
+#    sIndexAlpha: 2
+#    sIndexDelta: 0
+#    savingRate: 0
+#    initialisePotentialEarningsFromDatabase: true
+#    useWeights: false
+#    useSBAMMatching:
+#    projectMortality: true
+#    alignFertility: true
+#    labourMarketCovid19On: false
+#    projectFormalChildcare: true
+#    donorPoolAveraging: true
+#    alignEmployment: false
+#    projectSocialCare: false
+#    enableIntertemporalOptimisations: true
+#    responsesToLowWageOffer: true
+#    saveImperfectTaxDBMatches: false
+#    useSavedBehaviour: false
+#    readGrid: "laptop serial"
+#    saveBehaviour: true
+#    employmentOptionsOfPrincipalWorker: 3
+#    employmentOptionsOfSecondaryWorker: 3
+#    responsesToEducation: true
+#    responsesToRetirement: false
+#    responsesToHealth: true
+#    responsesToDisability: false
+#    minAgeForPoorHealth: 50
+#    responsesToRegion: false
+
+# Arguments that alter processing of the SimPathsMultiRun object
+innovation_args:
+#    randomSeedInnov: false
+#    intertemporalElasticityInnov: false
+#    labourSupplyElasticityInnov: true
+
+collector_args:
+  #    calculateGiniCoefficients: false
+  #    exportToDatabase: false
+  #    exportToCSV: true
+  #    persistStatistics: true
+  #    persistStatistics2: true
+  persistPersons: true
+  persistBenefitUnits: true
+  persistHouseholds: true
+#    dataDumpStartTime: 0L
+#    dataDumpTimePeriod: 1.0
+
+parameter_args:
+  scenario: "Legacy Benefits retained"
+  EUROMODpolicyScheduleFilename: "EUROMODpolicySchedule_UC"
+  euromod_output_directory: EUROMODoutput_LBA
+  #  input_directory: input_full
+  #  input_directory_initial_populations: input/InitialPopulations

config/test_create_database.yml

@@ -9,5 +9,6 @@ startYear: 2019
 endYear: 2030
 popSize: 40000
 
+
 parameter_args:
-  trainingFlag: true
+    trainingFlag: true

config/test_run.yml

@@ -8,6 +8,8 @@ startYear: 2019
 endYear: 2022
 popSize: 20000
 integrationTest: true
+countryString: United Kingdom
+persistCountryYear: false
 
 collector_args:
     persistWealthIncomeStatistics: true
@@ -16,3 +18,6 @@ collector_args:
     persistPersons: false
     persistBenefitUnits: false
     persistHouseholds: false
+
+parameter_args:
+    trainingFlag: true

config/uc_full.yml

@@ -0,0 +1,71 @@
+# This file can be used to override defaults for multirun arguments.
+# Arguments of the SimPathsMultiRun object overridden by the command-line
+
+maxNumberOfRuns: 1
+executeWithGui: false
+countryString: "United Kingdom"
+randomSeed: 100
+startYear: 2011
+endYear: 2035
+popSize: 170000
+
+# Arguments passed to the SimPathsModel
+model_args:
+#    maxAge: 130
+#    fixTimeTrend: true
+#    timeTrendStopsIn: 2017
+#    fixRandomSeed: true
+#    sIndexTimeWindow: 5
+#    sIndexAlpha: 2
+#    sIndexDelta: 0
+#    savingRate: 0
+#    initialisePotentialEarningsFromDatabase: true
+#    useWeights: false
+#    useSBAMMatching:
+#    projectMortality: true
+#    alignFertility: true
+#    labourMarketCovid19On: false
+#    projectFormalChildcare: true
+#    donorPoolAveraging: true
+#    alignEmployment: false
+#    projectSocialCare: false
+#    enableIntertemporalOptimisations: true
+#    responsesToLowWageOffer: true
+#    saveImperfectTaxDBMatches: false
+#    useSavedBehaviour: false
+#    readGrid: "laptop serial"
+#    saveBehaviour: true
+#    employmentOptionsOfPrincipalWorker: 3
+#    employmentOptionsOfSecondaryWorker: 3
+#    responsesToEducation: true
+#    responsesToRetirement: false
+#    responsesToHealth: true
+#    responsesToDisability: false
+#    minAgeForPoorHealth: 50
+#    responsesToRegion: false
+
+# Arguments that alter processing of the SimPathsMultiRun object
+innovation_args:
+#    randomSeedInnov: false
+#    intertemporalElasticityInnov: false
+#    labourSupplyElasticityInnov: true
+
+collector_args:
+#    calculateGiniCoefficients: false
+#    exportToDatabase: false
+#    exportToCSV: true
+#    persistStatistics: true
+#    persistStatistics2: true
+#    persistPersons: false
+#    persistBenefitUnits: false
+#    persistHouseholds: false
+#    dataDumpStartTime: 0L
+#    dataDumpTimePeriod: 1.0
+
+parameter_args:
+#  input_directory: input
+#  input_directory_initial_populations: input/InitialPopulations
+    euromod_output_directory: /home/abaxter/euromod_outs/uca
+    MIN_START_YEAR: 2011
+    MAX_START_YEAR: 2011
+    scenario: "UC only available benefit from 2014"

config/uc_full_on.yml

@@ -0,0 +1,69 @@
+# This file can be used to override defaults for multirun arguments.
+# Arguments of the SimPathsMultiRun object overridden by the command-line
+
+maxNumberOfRuns: 1
+countryString: "United Kingdom"
+executeWithGui: false
+startYear: 2015
+endYear: 2035
+popSize: 200000
+persistCountryYear: false
+
+# Arguments passed to the SimPathsModel
+model_args:
+#    maxAge: 130
+#    fixTimeTrend: true
+#    timeTrendStopsIn: 2017
+#    fixRandomSeed: true
+#    sIndexTimeWindow: 5
+#    sIndexAlpha: 2
+#    sIndexDelta: 0
+#    savingRate: 0
+#    initialisePotentialEarningsFromDatabase: true
+#    useWeights: false
+#    useSBAMMatching:
+#    projectMortality: true
+#    alignFertility: true
+#    labourMarketCovid19On: false
+#    projectFormalChildcare: true
+#    donorPoolAveraging: true
+#    alignEmployment: false
+#    projectSocialCare: false
+#    enableIntertemporalOptimisations: true
+#    responsesToLowWageOffer: true
+#    saveImperfectTaxDBMatches: false
+#    useSavedBehaviour: false
+#    readGrid: "laptop serial"
+#    saveBehaviour: true
+#    employmentOptionsOfPrincipalWorker: 3
+#    employmentOptionsOfSecondaryWorker: 3
+#    responsesToEducation: true
+#    responsesToRetirement: false
+#    responsesToHealth: true
+#    responsesToDisability: false
+#    minAgeForPoorHealth: 50
+#    responsesToRegion: false
+
+# Arguments that alter processing of the SimPathsMultiRun object
+innovation_args:
+#    randomSeedInnov: false
+#    intertemporalElasticityInnov: false
+#    labourSupplyElasticityInnov: true
+
+collector_args:
+#    calculateGiniCoefficients: false
+#    exportToDatabase: false
+#    exportToCSV: true
+#    persistStatistics: true
+#    persistStatistics2: true
+   persistPersons: true
+   persistBenefitUnits: true
+   persistHouseholds: true
+#    dataDumpStartTime: 0L
+#    dataDumpTimePeriod: 1.0
+
+parameter_args:
+  scenario: "UC on full"
+  EUROMODpolicyScheduleFilename: "EUROMODpolicySchedule_UC"
+#  input_directory_initial_populations: input/InitialPopulations
+#  euromod_output_directory: input/EUROMODoutput