Updated estimates/initial populations for the UK

.github/workflows/SimPathsBuild.yml

@@ -14,52 +14,101 @@ on:
 
 jobs:
   build:
-
     runs-on: [ ubuntu-latest ]
-
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up JDK 19
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: '19'
         distribution: 'temurin'
         cache: maven
     - name: Build with Maven
       run: mvn -B package --file pom.xml
-
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: simpaths_jars
         path: ./*.jar
 
-  run-simpaths:
-    needs: build
-
+  run-integration-tests:
     runs-on: [ ubuntu-latest ]
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up JDK 19
+      uses: actions/setup-java@v4
+      with:
+        java-version: '19'
+        distribution: 'temurin'
+        cache: maven
+    - name: Run integration tests
+      run: mvn verify
 
+  run-simpaths-start:
+    needs: build
+    runs-on: [ ubuntu-latest ]
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 19
+        uses: actions/setup-java@v4
+        with:
+          java-version: '19'
+          distribution: 'temurin'
+      - uses: actions/download-artifact@v4
+        with:
+          name: simpaths_jars
+          path: .
+      - name: Do one full Setup and Run with SimPathsStart (mimicking GUI run)
+        run: java -jar singlerun.jar -c UK -s 2019 -g false --rewrite-policy-schedule
+      - name: Check input db exists
+        id: check_file
+        uses: thebinaryfelix/check-file-existence-action@1.0.0
+        with:
+          files: 'input/input.mv.db, input/EUROMODpolicySchedule.xlsx, input/DatabaseCountryYear.xlsx'
 
+  run-simpaths-persist-root:
+    needs: build
+    runs-on: [ ubuntu-latest ]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up JDK 19
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: '19'
         distribution: 'temurin'
-
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         name: simpaths_jars
         path: .
-
     - name: Setup run
-      run: java -jar singlerun.jar -c UK -s 2017 -Setup -g false --rewrite-policy-schedule
-
+      run: java -jar multirun.jar -DBSetup -config test_create_database.yml
     - name: Check input db exists
       id: check_file
       uses: thebinaryfelix/check-file-existence-action@1.0.0
       with:
         files: 'input/input.mv.db, input/EUROMODpolicySchedule.xlsx, input/DatabaseCountryYear.xlsx'
+    - name: Do two runs with persistence to root database
+      run: java -jar multirun.jar -config test_run.yml --persist=root
 
-    - name: Do one run
-      run: java -jar multirun.jar -p 20000 -s 2019 -e 2022 -r 100 -n 2 -g false
+  run-simpaths-no-persist:
+    needs: build
+    runs-on: [ ubuntu-latest ]
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up JDK 19
+      uses: actions/setup-java@v4
+      with:
+        java-version: '19'
+        distribution: 'temurin'
+    - uses: actions/download-artifact@v4
+      with:
+        name: simpaths_jars
+        path: .
+    - name: Setup run
+      run: java -jar multirun.jar -DBSetup -config test_create_database.yml
+    - name: Check input db exists
+      id: check_file
+      uses: thebinaryfelix/check-file-existence-action@1.0.0
+      with:
+        files: 'input/input.mv.db, input/EUROMODpolicySchedule.xlsx, input/DatabaseCountryYear.xlsx'
+    - name: Do two runs with no persistence
+      run: java -jar multirun.jar -config test_run.yml --persist=none

.gitignore

@@ -336,3 +336,5 @@ 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/*

README.md

@@ -56,7 +56,7 @@ To run the SimPathsStart setup phases and set up a population for subsequent mul
 - `-c` Country ['UK' or 'IT']
 - `-s` Start year
 - `-g` [true/false] show/hide gui
-- `-r` Re-write policy schedule from detected policy files
+- `--rewrite-policy-schedule` Re-write policy schedule from detected policy files
 - `-Setup` do setup phases (creating input populations database) only
 
 e.g.

analysis/employment analysis.do

@@ -0,0 +1,83 @@
+/**************************************************************************************
+*
+*	PROGRAM TO ANALYSE EMPLOYMENT TRANSATIONS
+*
+*	Last version:  Justin van de Ven, 06 May 2025
+*	First version: Justin van de Ven, 06 May 2025
+*
+**************************************************************************************/
+
+clear all
+global moddir = "C:\Justin\dev\SimPaths\output\20250506123915\csv"
+global outdir = "C:\Justin\dev\SimPaths\analysis\"
+cd "$outdir"
+
+
+/**************************************************************************************
+*	start
+**************************************************************************************/
+global year_start = 2019
+global year_end = 2030
+
+
+/**************************************************************************************
+*	load data
+**************************************************************************************/
+import delimited using "$moddir/BenefitUnit.csv", clear
+rename *, l
+rename id_benefitunit idbenefitunit
+gsort idbenefitunit time
+save "$outdir/temp0", replace
+import delimited using "$moddir/Person.csv", clear
+rename *, l
+rename id_person idperson
+rename socialcareprovision socialcareprovision_p
+gsort idbenefitunit time idperson
+merge m:1 idbenefitunit time using temp0
+gsort time idbenefitunit idperson
+gen refbenefitunit = 0
+replace refbenefitunit = 1 if (idbenefitunit != idbenefitunit[_n-1])
+
+destring hoursworkedweekly, replace force
+recode hoursworkedweekly (missing=0)
+gen idNotEmployedAdult = (hoursworkedweekly<0.1 & dag>17)
+
+gen led = (deh_c3=="Low")
+gen med = (deh_c3=="Medium")
+gen hed = (deh_c3=="High")
+
+gen male = (dgn=="Male")
+
+gen idna = (dag>17)
+gen idnk = (dag<18)
+bys time idbenefitunit: egen partnered = sum(idna)
+replace partnered = partnered - 1
+bys time idbenefitunit: egen nk = sum(idnk)
+
+save "$outdir/temp1", replace
+
+
+/**************************************************************************************
+*	analysis
+**************************************************************************************/
+use "$outdir/temp1", clear
+global year_ref = $year_start-1
+
+// block 1 statistics
+gen emp = (hoursworkedweekly>0.5)
+gen emp_to_nemp = 0
+gen nemp_to_emp = 0
+gsort idperson time
+replace emp_to_nemp = 1 if (idperson[_n-1]==idperson & time[_n-1]+1==time & emp[_n-1]==1 & emp==0)
+replace nemp_to_emp = 1 if (idperson[_n-1]==idperson & time[_n-1]+1==time & emp[_n-1]==0 & emp==1)
+order time idperson hoursworkedweekly emp emp_to_nemp
+matrix store1 = J($year_end-$year_ref,2,.)
+forvalues yy = $year_start/$year_end {
+	qui{
+		sum emp_to_nemp if (time==`yy' & dag>17 & dag<65), mean
+		mat store1[`yy'-${year_ref},1] = r(mean)
+		sum nemp_to_emp if (time==`yy' & dag>17 & dag<65), mean
+		mat store1[`yy'-${year_ref},2] = r(mean)
+	}
+}
+matlist store1

config/create database.yml

@@ -1,4 +1,6 @@
-# This file can be used to override defaults for multirun arguments.
+
+# CONFIG FILE TO CREATE NEW DATABASE OBJECTS
+
 # Arguments of the SimPathsMultiRun object overridden by the command-line
 countryString: "United Kingdom"
 maxNumberOfRuns: 1

config/employmentTransStats.yml

@@ -0,0 +1,64 @@
+# 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
+randomSeed: 606
+startYear: 2011
+endYear: 2020
+popSize: 50000
+
+# 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: false
+    persistStatistics2: false
+    persistStatistics3: false
+    persistPersons: false
+    persistBenefitUnits: false
+    persistHouseholds: false
+    persistEmploymentStatistics: true
+#    dataDumpStartTime: 0L
+#    dataDumpTimePeriod: 1.0

config/test_create_database.yml

@@ -0,0 +1,10 @@
+# FOR TESTING
+# CONFIG FILE TO CREATE NEW DATABASE OBJECTS
+
+# Arguments of the SimPathsMultiRun object overridden by the command-line
+countryString: "United Kingdom"
+executeWithGui: false
+randomSeed: 606
+startYear: 2019
+endYear: 2030
+popSize: 40000

config/test_run.yml

@@ -0,0 +1,17 @@
+# This file can be used to override defaults for multirun arguments.
+# Arguments of the SimPathsMultiRun object overridden by the command-line
+
+maxNumberOfRuns: 2
+executeWithGui: false
+randomSeed: 100
+startYear: 2019
+endYear: 2022
+popSize: 20000
+
+collector_args:
+    persistStatistics: true
+    persistStatistics2: true
+    persistStatistics3: true
+    persistPersons: false
+    persistBenefitUnits: false
+    persistHouseholds: false