Merge pull request #214 from imperialCHEPI/food_init

Food initialisation
imperialCHEPI · Oct 12, 2023 · 735e0f3 · 735e0f3
2 parents 2b585c8 + 18bad0c
commit 735e0f3
Show file tree

Hide file tree

Showing 20 changed files with 599 additions and 277,513 deletions.
diff --git a/README.md b/README.md
@@ -46,6 +46,7 @@ The code in this repository is licensed under the [BSD 3-Clause](LICENSE.txt) li
 | [Adevs](https://sourceforge.net/projects/adevs)       | BSD 3-Clause |
 | [crossguid](https://github.com/graeme-hill/crossguid) | MIT          |
 | [cxxopts](https://github.com/jarro2783/cxxopts)       | MIT          |
+| [eigen](https://eigen.tuxfamily.org)                  | MPL2         |
 | [fmt](https://github.com/fmtlib/fmt)                  | MIT          |
 | [nlohmann-json](https://github.com/nlohmann/json)     | MIT          |
 | [rapidcsv](https://github.com/d99kris/rapidcsv)       | BSD 3-Clause |

diff --git a/example/France.NewEBM.json b/example/France.NewEBM.json
diff --git a/example_new/France.Config.json → example_new/Config.json b/example_new/France.Config.json → example_new/Config.json
@@ -43,43 +43,18 @@
                 "level": 0,
                 "range": [1, 87]
             },
-            {
-                "name": "Age2",
-                "level": 0,
-                "range": [1, 7569]
-            },
-            {
-                "name": "Age3",
-                "level": 0,
-                "range": [1, 658503]
-            },
             {
                 "name": "SES",
                 "level": 0,
                 "range": [-2.316299, 2.296689]
             },
             {
-                "name": "Sodium",
-                "level": 1,
-                "range": [1.127384, 8.656519]
-            },
-            {
-                "name": "Protein",
-                "level": 1,
-                "range": [43.50682, 238.4145]
-            },
-            {
-                "name": "Fat",
-                "level": 1,
-                "range": [45.04756, 382.664098658922]
-            },
-            {
-                "name": "PA",
+                "name": "PhysicalActivityLevel",
                 "level": 2,
                 "range": [22.22314, 9765.512]
             },
             {
-                "name": "Energy",
+                "name": "EnergyIntake",
                 "level": 2,
                 "range": [1326.14051277588, 7522.496]
             },
@@ -90,16 +65,16 @@
             }
         ],
         "risk_factor_models": {
-            "static": "France.HLM.json",
-            "dynamic": "France.NewEBM.json"
+            "static": "StaticLinear.json",
+            "dynamic": "KevinHall.json"
         },
         "baseline_adjustments": {
             "format": "csv",
             "delimiter": ",",
             "encoding": "UTF8",
             "file_names": {
-                "factorsmean_male": "France.FactorsMean.Male.csv",
-                "factorsmean_female": "France.FactorsMean.Female.csv"
+                "factorsmean_male": "FactorsMean.Male.csv",
+                "factorsmean_female": "FactorsMean.Female.csv"
             }
         }
     },

diff --git a/example_new/FactorsMean.Female.csv b/example_new/FactorsMean.Female.csv
@@ -0,0 +1,102 @@
+Age,Alcohol,Carbohydrate,Fat,Protein,Sodium
+0,0.0,144.892664419936,54.7022488365615,44.0097180197551,1133.32921917935
+1,0.0,149.199677621964,55.9462607381289,45.5980289635954,1212.91992916289
+2,0.0,153.285679391595,57.1452466708081,47.1314139219541,1289.34788703643
+3,0.0,157.155505509296,58.2999112357916,48.6107317488705,1362.67560057659
+4,0.0,160.813991755533,59.410959034272,50.0368412983843,1432.96557755994
+5,0.0,164.265973910772,60.4790946674419,51.4106014245349,1500.2803257631
+6,0.0,167.51628775548,61.5050227364936,52.7328709813621,1564.68235296265
+7,0.0,170.569769070123,62.4894478426198,54.0045088229052,1626.23416693519
+8,0.0,173.431253635168,63.433074587013,55.2263738032039,1684.99827545731
+9,0.0,176.10557723108,64.3366075708657,56.3993247762977,1741.03718630562
+10,0.0,178.597575638327,65.2007513953704,57.5242205962261,1794.41340725671
+11,0.0,180.912084637374,66.0262106617197,58.6019201170288,1845.18944608717
+12,0.0,183.053940008688,66.813689971106,59.6332821927452,1893.4278105736
+13,0.0,185.027977532735,67.5638939247219,60.619165677415,1939.1910084926
+14,0.0,186.839032989982,68.27752712376,61.5604294250776,1982.54154762076
+15,0.0,188.491942160895,68.9552941694127,62.4579322897727,2023.54193573468
+16,0.0,189.99154082594,69.5978996628726,63.3125331255397,2062.25468061095
+17,0.0,191.342664765584,70.2060482053322,64.1250907864183,2098.74229002617
+18,0.0,192.550149760293,70.780444397984,64.8964641264479,2133.06727175694
+19,0.0,193.618831590533,71.3217928420206,65.6275119996681,2165.29213357984
+20,0.0,194.553546036771,71.8307981386344,66.3190932601185,2195.47938327149
+21,0.0,195.359128879473,72.3081648890181,66.9720667618387,2223.69152860847
+22,0.0,196.040415899105,72.7545976943641,67.5872913588682,2249.99107736738
+23,0.0,196.602242876135,73.1708011558649,68.1656259052465,2274.44053732481
+24,0.0,197.049445591027,73.5574798747131,68.7079292550131,2297.10241625736
+25,0.0,197.386859824249,73.9153384521012,69.2150602622077,2318.03922194163
+26,0.0,197.619321356267,74.2450814892217,69.6878777808699,2337.31346215422
+27,0.0,197.751665967547,74.5474135872672,70.127240665039,2354.98764467171
+28,0.0,197.788729438555,74.8230393474302,70.5340077687547,2371.12427727071
+29,0.0,197.735347549759,75.0726633709031,70.9090379460566,2385.7858677278
+30,0.0,197.596356081623,75.2969902588786,71.2531900509842,2399.0349238196
+31,0.0,197.376590814616,75.4967246125492,71.5673229375771,2410.93395332269
+32,0.0,197.080887529202,75.6725710331073,71.8522954598747,2421.54546401366
+33,0.0,196.714082005848,75.8252341217455,72.1089664719167,2430.93196366912
+34,0.0,196.281010025022,75.9554184796563,72.3381948277426,2439.15596006566
+35,0.0,195.786507367188,76.0638287080323,72.540839381392,2446.27996097987
+36,0.0,195.235409812814,76.151169408066,72.7177589869044,2452.36647418836
+37,0.0,194.632553142365,76.2181451809499,72.8698124983193,2457.47800746772
+38,0.0,193.982773136309,76.2654606278765,72.9978587696764,2461.67706859453
+39,0.0,193.290905575111,76.2938203500383,73.1027566550151,2465.02616534541
+40,0.0,192.561786239238,76.303928948628,73.185365008375,2467.58780549695
+41,0.0,191.800250909156,76.2964910248379,73.2465426837957,2469.42449682573
+42,0.0,191.011135365332,76.2722111798606,73.2871485353168,2470.59874710836
+43,0.0,190.199275388231,76.2317940148887,73.3080414169777,2471.17306412144
+44,0.0,189.369506758321,76.1759441311147,73.310080182818,2471.20995564155
+45,0.0,188.526665256067,76.1053661297311,73.2941236868773,2470.7719294453
+46,0.0,187.675586661937,76.0207646119304,73.2610307831952,2469.92149330928
+47,0.0,186.821106756395,75.9228441789052,73.2116603258111,2468.72115501009
+48,0.0,185.968061319909,75.8123094318479,73.1468711687646,2467.23342232432
+49,0.0,185.121286132946,75.6898649719511,73.0675221660954,2465.52080302857
+50,0.0,184.28561697597,75.5562154004074,72.9744721718429,2463.64580489943
+51,0.0,183.46588962945,75.4120653184092,72.8685800400466,2461.67093571351
+52,0.0,182.66693987385,75.2581193271491,72.7507046247462,2459.65870324739
+53,0.0,181.893603489638,75.0950820278196,72.6217047799812,2457.67161527767
+54,0.0,181.150716257279,74.9236580216132,72.4824393597912,2455.77217958095
+55,0.0,180.443113957241,74.7445519097225,72.3337672182156,2454.02290393383
+56,0.0,179.775632369989,74.5584682933399,72.1765472092941,2452.48629611289
+57,0.0,179.15310727599,74.366111773658,72.0116381870662,2451.22486389474
+58,0.0,178.580374455711,74.1681869518694,71.8398990055715,2450.30111505597
+59,0.0,178.062269689617,73.9653984291665,71.6621885188494,2449.77755737318
+60,0.0,177.603628758174,73.7584508067419,71.4793655809396,2449.71669862297
+61,0.0,177.20928744185,73.5480486857881,71.2922890458816,2450.18104658192
+62,0.0,176.884081521111,73.3348966674976,71.101817767715,2451.23310902664
+63,0.0,176.632846776422,73.119699353063,70.9088106004793,2452.93539373372
+64,0.0,176.460418988251,72.9031613436768,70.714126398214,2455.35040847976
+65,0.0,176.371633937064,72.6859872405314,70.5186240149588,2458.54066104135
+66,0.0,176.371327403327,72.4688816448195,70.3231623047532,2462.56865919509
+67,0.0,176.464335167506,72.2525491577335,70.1286001216366,2467.49691071757
+68,0.0,176.655493010067,72.037694380466,69.9357963196487,2473.3879233854
+69,0.0,176.949636711478,71.8250219142095,69.7456097528291,2480.30420497516
+70,0.0,177.351602052205,71.6152363601566,69.5588992752172,2488.30826326346
+71,0.0,177.866224812713,71.4090423194996,69.3765237408526,2497.46260602688
+72,0.0,178.498340773469,71.2071443934313,69.199342003775,2507.82974104203
+73,0.0,179.25278571494,71.0102471831441,69.0282129180237,2519.4721760855
+74,0.0,180.134395417592,70.8190552898305,68.8639953376385,2532.45241893388
+75,0.0,181.148005661891,70.634273314683,68.7075481166587,2546.83297736378
+76,0.0,182.298452228303,70.4566058588942,68.5597301091241,2562.67635915178
+77,0.0,183.590570897296,70.2867575236566,68.4214001690741,2580.04507207449
+78,0.0,185.029197449335,70.1254329101627,68.2934171505483,2599.0016239085
+79,0.0,186.619167664886,69.9733366196052,68.1766399075862,2619.60852243041
+80,0.0,188.365317324416,69.8311732531763,68.0719272942275,2641.9282754168
+81,0.0,190.272482208392,69.6996474120688,67.9801381645116,2666.02339064429
+82,0.0,192.34549809728,69.5794636974751,67.902131372478,2691.95637588945
+83,0.0,194.589200771545,69.4713267105877,67.8387657721664,2719.7897389289
+84,0.0,197.008426011655,69.3759410525992,67.7909002176164,2749.58598753922
+85,0.0,199.608009598076,69.2940113247022,67.7593935628673,2781.40762949702
+86,0.0,202.392787311274,69.226242128089,67.7451046619589,2815.31717257888
+87,0.0,205.367594931715,69.1733380639523,67.7488923689307,2851.3771245614
+88,0.0,208.537268239867,69.1360037334846,67.7716155378221,2889.64999322119
+89,0.0,211.906643016194,69.1149437378783,67.8141330226728,2930.19828633483
+90,0.0,215.480555041164,69.1108626783261,67.8773036775224,2973.08451167892
+91,0.0,219.263840095243,69.1244651560205,67.9619863564102,3018.37117703005
+92,0.0,223.261333958897,69.1564557721539,68.069039913376,3066.12079016483
+93,0.0,227.477872412592,69.207539127919,68.1993232024593,3116.39585885985
+94,0.0,231.918291236796,69.2784198245081,68.3536950776996,3169.2588908917
+95,0.0,236.587426211974,69.3698024631139,68.5330143931365,3224.77239403698
+96,0.0,241.490113118593,69.4823916449289,68.7381400028095,3282.99887607229
+97,0.0,246.631187737119,69.6168919711455,68.9699307607582,3344.00084477421
+98,0.0,252.015485848018,69.7740080429565,69.229245521022,3407.84080791936
+99,0.0,257.647843231756,69.9544444615541,69.5169431376407,3474.58127328432
+100,0.0,263.533095668801,70.158905828131,69.8338824646537,3544.2847486457