Code

Sector and income#230

Code

Merged

jamesturner246 merged 29 commits intomainimperialCHEPI/healthgps:mainfrom sector_and_incomeimperialCHEPI/healthgps:sector_and_incomeCopy head branch name to clipboardOct 27, 2023

+375-138

Commits

Commits on Oct 20, 2023

• Add SectorPrevalence to KevinHall.json config.

  jamesturner246

  committed
  de623fd

  Copy full SHA for de623fd

• Load Rural Prevalence into model parser from JSON.

  jamesturner246

  committed
  d638cef

  Copy full SHA for d638cef

• Load Rural Prevalence into KH model.

  jamesturner246

  committed
  585e936

  Copy full SHA for 585e936

• We want all our RF models' generate_ methods to run.

  jamesturner246

  committed
  1922906

  Copy full SHA for 1922906

• Add stub initialise_sector method to KH model class.

  jamesturner246

  committed
  3a6534e

  Copy full SHA for 3a6534e

• Add enum type for sector (region).

  jamesturner246

  committed
  e5a312c

  Copy full SHA for e5a312c

• Add 'unknown' sector enum type, and inititalise people to unknown sector.

  jamesturner246

  committed
  87c4eac

  Copy full SHA for 87c4eac

• Finish initialise_sector code in KevinHall.

  jamesturner246

  committed
  5f9a7fe

  Copy full SHA for 5f9a7fe

• Clarify that we are using rural prevalence here.

  jamesturner246

  committed
  eb35572

  Copy full SHA for eb35572

• Don't std move trivial type

  Show description for c404c0a
  

  jamesturner246

  and

  github-actions[bot]

  authored
  c404c0a

  Copy full SHA for c404c0a

Commits on Oct 23, 2023

• model parser clang-tidy.

  jamesturner246

  committed
  f4d6638

  Copy full SHA for f4d6638

• Add Income model parameters to KevinHall config JSON.

  jamesturner246

  committed
  b4d72ab

  Copy full SHA for b4d72ab

• Load income models from JSON in mdoel parser.

  jamesturner246

  committed
  d7f5b61

  Copy full SHA for d7f5b61

• Load income models from mdoel parser into kevin hall model.

  jamesturner246

  committed
  7c0846f

  Copy full SHA for 7c0846f

Commits on Oct 24, 2023

• Add missing category_1 income model.

  jamesturner246

  committed
  1aea169

  Copy full SHA for 1aea169

• LinearModelParams should be a vector.

  jamesturner246

  committed
  3c6ad90

  Copy full SHA for 3c6ad90

• Add initialise_income to kevin hall model.

  jamesturner246

  committed
  c72c2bc

  Copy full SHA for c72c2bc

Commits on Oct 25, 2023

• Fix read after std::move.

  jamesturner246

  committed
  61ab5b7

  Copy full SHA for 61ab5b7

• Call initialise_income in KH model.

  jamesturner246

  committed
  06e553e

  Copy full SHA for 06e553e

• Add sector update code to kevinhall.

  jamesturner246

  committed
  e373e53

  Copy full SHA for e373e53

• Code to convert sector to a real, for use as a coefficient. Add error checking for unknown gender and sector.

  jamesturner246

  committed
  f5a22d2

  Copy full SHA for f5a22d2

• Age group name consistency.

  jamesturner246

  committed
  2326ca9

  Copy full SHA for 2326ca9

• Add person method to check over 18.

  jamesturner246

  committed
  3985efa

  Copy full SHA for 3985efa

• Add kevinhall code to update income.

  jamesturner246

  committed
  905223a

  Copy full SHA for 905223a

Commits on Oct 26, 2023

• Change weird if

  Show description for 71926bd
  

  jamesturner246

  and

  alexdewar

  authored
  71926bd

  Copy full SHA for 71926bd

• nutrient_ranges is now a Double interval, interval now has its own clamp method, and disallowed nonsensical intervals at construction.

  jamesturner246

  committed
  d32fd44

  Copy full SHA for d32fd44

• KH: rural_prevalence should be an unordered_map.

  jamesturner246

  committed
  a44f19c

  Copy full SHA for a44f19c

• KH: use vector reserve, rather than letting it zero init.

  jamesturner246

  committed
  0ab8ef6

  Copy full SHA for 0ab8ef6

• KH: push_back, don't assign, into reserved vector.

  jamesturner246

  committed
  1ebaa1a

  Copy full SHA for 1ebaa1a