add weight, don't commute anti_nutrient to nutr_def

diff --git a/data/process.py b/data/process.py
index b9f34b502572e51ef34909da0e62ffbb880b7250..ae1f9a2843afe22d0f9de8d33bc9cc7fd32cf545 100644 (file)
--- a/data/process.py
+++ b/data/process.py
@@ -125,7 +125,7 @@ def process_nutr_def():
                 rdas[id]["tagname"] if not row["tagname"] else row["tagname"]
             )
             row["nutr_desc"] = row.pop("NutrDesc")
-            row["anti_nutrient"] = rdas[id]["anti_nutrient"]
+            # row["anti_nutrient"] = rdas[id]["anti_nutrient"]
             row["num_dec"] = row.pop("Num_Dec")
             row["sr_order"] = row.pop("SR_Order")
             row["flav_class"] = None
@@ -155,7 +155,7 @@ def process_nutr_def():
                 rdas[id]["tagname"] if not row["tagname"] else row["tagname"]
             )
             row["nutr_desc"] = row.pop("NutrDesc")
-            row["anti_nutrient"] = rdas[id]["anti_nutrient"]
+            # row["anti_nutrient"] = rdas[id]["anti_nutrient"]
             row["num_dec"] = row.pop("Num_Dec") if "Num_Dec" in row else None
             row["sr_order"] = row.pop("SR_Order") if "SR_Order" in row else None
             row["flav_class"] = row.pop("Flav_Class") if "Flav_Class" in row else None

diff --git a/data/rda.csv b/data/rda.csv
index 007decfa181a3b698fe9e6631638ed855cf8fa3f..27329c552374b98031f4f860a4b6b8783f4262c7 100644 (file)
--- a/data/rda.csv
+++ b/data/rda.csv
@@ -1,189 +1,189 @@
-id,rda,units,tagname,nutr_desc,anti_nutrient
-203,60,g,PRO,Protein,
-204,90,g,FAT,Total lipid (fat),
-205,230,g,CARB,"Carbohydrate, by difference",
-207,,g,ASH,Ash,
-208,1850,kcal,CAL,Energy,
-209,,g,STARCH,Starch,
-210,,g,SUCS,Sucrose,
-211,,g,GLUS,Glucose (dextrose),
-212,,g,FRUS,Fructose,
-213,,g,LACS,Lactose,
-214,,g,MALS,Maltose,
-221,,g,ALC,"Alcohol, ethyl",
-255,,g,WATER,Water,
-262,,mg,CAFFN,Caffeine,
-263,,mg,THEBRN,Theobromine,
-268,,kJ,ENERC_KJ,Energy,
-269,80,g,SUGAR,"Sugars, total",t
-287,,g,GALS,Galactose,
-291,30,g,FIBTG,"Fiber, total dietary",
-301,1300,mg,CA,"Calcium, Ca",
-303,18,mg,FE,"Iron, Fe",
-304,420,mg,MG,"Magnesium, Mg",
-305,1250,mg,P,"Phosphorus, P",
-306,4700,mg,K,"Potassium, K",
-307,1500,mg,NA,"Sodium, Na",t
-309,11,mg,ZN,"Zinc, Zn",
-312,0.9,mg,CU,"Copper, Cu",
-313,,µg,FL,"Fluoride, F",t
-315,2.3,mg,MN,"Manganese, Mn",
-317,55,µg,SE,"Selenium, Se",
-318,5000,IU,VITA_IU,"Vitamin A, IU",
-319,,µg,RETOL,Retinol,
-320,900,µg,VITA_RAE,"Vitamin A, RAE",
-321,,µg,CARTB,"Carotene, beta",
-322,,µg,CARTA,"Carotene, alpha",
-323,,mg,TOCPHA,Vitamin E (alpha-tocopherol),
-324,800,IU,VITD_IU,Vitamin D,
-325,,µg,ERGCAL,Vitamin D2 (ergocalciferol),
-326,,µg,CHOCAL,Vitamin D3 (cholecalciferol),
-328,20,µg,VITD,Vitamin D (D2 + D3),
-334,,µg,CRYPX,"Cryptoxanthin, beta",
-337,3000,µg,LYCPN,Lycopene,
-338,7000,µg,LUTZEA,Lutein + zeaxanthin,
-341,,mg,TOCPHB,"Tocopherol, beta",
-342,,mg,TOCPHG,"Tocopherol, gamma",
-343,,mg,TOCPHD,"Tocopherol, delta",
-344,,mg,TOCTRA,"Tocotrienol, alpha",
-345,,mg,TOCTRB,"Tocotrienol, beta",
-346,,mg,TOCTRG,"Tocotrienol, gamma",
-347,,mg,TOCTRD,"Tocotrienol, delta",
-401,90,mg,VITC,"Vitamin C, total ascorbic acid",
-404,1.2,mg,B1,Thiamin,
-405,1.3,mg,B2,Riboflavin,
-406,16,mg,B3,Niacin,
-410,5,mg,B5,Pantothenic acid,
-415,1.7,mg,B6,Vitamin B-6,
-417,400,µg,B9,"Folate, total",
-418,2.4,µg,B12,Vitamin B-12,
-421,550,mg,CHO,"Choline, total",
-428,,µg,MK4,Menaquinone-4,
-429,,µg,VITK1D,Dihydrophylloquinone,
-430,120,µg,VITK,Vitamin K (phylloquinone),
-431,,µg,FOLAC,Folic acid,
-432,,µg,FOLFD,"Folate, food",
-435,,µg,FOLDFE,"Folate, DFE",
-454,,mg,BETN,Betaine,
-501,0.3,g,TRP_G,Tryptophan,
-502,1,g,THR_G,Threonine,
-503,1.4,g,ILE_G,Isoleucine,
-504,2.7,g,LEU_G,Leucine,
-505,2.1,g,LYS_G,Lysine,
-506,0.8,g,MET_G,Methionine,
-507,,g,CYS_G,Cystine,
-508,1.2,g,PHE_G,Phenylalanine,
-509,1.4,g,TYR_G,Tyrosine,
-510,1.8,g,VAL_G,Valine,
-511,1,g,ARG_G,Arginine,
-512,0.8,g,HISTN_G,Histidine,
-513,1,g,ALA_G,Alanine,
-514,1,g,ASP_G,Aspartic acid,
-515,2,g,GLU_G,Glutamic acid,
-516,0.8,g,GLY_G,Glycine,
-517,0.6,g,PRO_G,Proline,
-518,1.6,g,SER_G,Serine,
-521,,g,HYP,Hydroxyproline,
-573,,mg,VITE_ADD,"Vitamin E, added",
-578,,µg,B12_ADD,"Vitamin B-12, added",
-601,200,mg,CHOLEST,Cholesterol,t
-605,,g,FATRN,"Fatty acids, total trans",t
-606,30,g,FASAT,"Fatty acids, total saturated",t
-607,,g,F4D0,4:0,
-608,,g,F6D0,6:0,
-609,,g,F8D0,8:0,
-610,,g,F10D0,10:0,
-611,,g,F12D0,12:0,
-612,,g,F14D0,14:0,
-613,,g,F16D0,16:0,
-614,,g,F18D0,18:0,
-615,,g,F20D0,20:0,
-617,,g,F18D1,18:1 undifferentiated,
-618,,g,F18D2,18:2 undifferentiated,
-619,,g,F18D3,18:3 undifferentiated,
-620,,g,F20D4,20:4 undifferentiated,
-621,0.2,g,F22D6,22:6 n-3 (DHA),
-624,,g,F22D0,22:0,
-625,,g,F14D1,14:1,
-626,,g,F16D1,16:1 undifferentiated,
-627,,g,F18D4,18:4,
-628,,g,F20D1,20:1,
-629,0.1,g,F20D5,20:5 n-3 (EPA),
-630,,g,F22D1,22:1 undifferentiated,
-631,,g,F22D5,22:5 n-3 (DPA),
-636,,mg,PHYSTR,Phytosterols,
-638,,mg,STID7,Stigmasterol,
-639,,mg,CAMD5,Campesterol,
-641,,mg,SITSTR,Beta-sitosterol,
-645,35,g,FAMS,"Fatty acids, total monounsaturated",
-646,25,g,FAPU,"Fatty acids, total polyunsaturated",
-652,,g,F15D0,15:0,
-653,,g,F17D0,17:0,
-654,,g,F24D0,24:0,
-662,,g,F16D1T,16:1 t,
-663,,g,F18D1T,18:1 t,
-664,,g,F22D1T,22:1 t,
-665,,g,F18D2NFD,18:2 t not further defined,
-666,,g,F18D2I,18:2 i,
-669,,g,F18D2TT,"18:2 t,t",
-670,,g,F18D2CLA,18:2 CLAs,
-671,,g,F24D1C,24:1 c,
-672,,g,F20D2CN6,"20:2 n-6 c,c",
-673,,g,F16D1C,16:1 c,
-674,,g,F18D1C,18:1 c,
-675,,g,F18D2CN6,"18:2 n-6 c,c",
-676,,g,F22D1C,22:1 c,
-685,,g,F18D3CN6,"18:3 n-6 c,c,c",
-687,,g,F17D1,17:1,
-689,,g,F20D3,20:3 undifferentiated,
-693,,g,FATRNM,"Fatty acids, total trans-monoenoic",
-695,,g,FATRNP,"Fatty acids, total trans-polyenoic",
-696,,g,F13D0,13:0,
-697,,g,F15D1,15:1,
-851,2,g,F18D3CN3,"18:3 n-3 c,c,c (ALA)",
-852,,g,F20D3N3,20:3 n-3,
-853,,g,F20D3N6,20:3 n-6,
-855,,g,F20D4N6,20:4 n-6,
-856,,g,F18D3I,18:3i,
-857,,g,F21D5,21:5,
-858,,g,F22D4,22:4,
-859,,g,F18D1TN7,18:1-11 t (18:1t n-7),
-710,30,mg,DAID,Daidzein,
-711,15,mg,GENI,Genistein,
-712,,mg,GLYC,Glycitein,
-713,45,mg,TOTISO,Total isoflavones,
-714,,mg,BIOC,Biochanin A,
-715,,mg,FORM,Formononetin,
-716,,mg,COUM,Coumestrol,
-734,5,mg,PAdimer,Proanthocyanidin dimers,
-735,5,mg,PAtrimer,Proanthocyanidin trimers,
-736,20,mg,PA4-6mer,Proanthocyanidin 4-6mers,
-737,20,mg,PA7-10mer,Proanthocyanidin 7-10mers,
-738,60,mg,PApolymer,Proanthocyanidin polymers (>10mers),
-731,20,mg,CYAD,Cyanidin,
-740,,mg,PETUNIDIN,Petunidin,
-741,,mg,DELPH,Delphinidin ,
-742,,mg,MALVIDIN,Malvidin,
-743,,mg,PELA,Pelargonidin,
-745,,mg,PEONIDIN,Peonidin,
-749,40,mg,CATE,(+)-Catechin,
-750,40,mg,EPICATEGC,(-)-Epigallocatechin,
-751,40,mg,EPICATEC,(-)-Epicatechin,
-752,40,mg,EPICATECG3,(-)-Epicatechin 3-gallate,
-753,60,mg,EGCG,(-)-Epigallocatechin 3-gallate,
-755,,mg,THEAF,Theaflavin,
-756,,mg,THEAR,Thearubigins,
-758,,mg,ERIOD,Eriodictyol,
-759,80,mg,HESPT,Hesperetin,
-762,60,mg,NARING,Naringenin,
-770,30,mg,APIGEN,Apigenin,
-773,20,mg,LUTEOL,Luteolin,
-785,5,mg,ISORHAM,Isorhamnetin,
-786,5,mg,KAEMF,Kaempferol,
-788,2,mg,MYRIC,Myricetin,
-789,20,mg,QUERCE,Quercetin,
-791,,mg,THEA3DI,"Theaflavin-3,3'-digallate",
-792,,mg,THEA3GP,Theaflavin-3'-gallate,
-793,,mg,THEA3G,Theaflavin-3-gallate,
-794,,mg,GALCATEGC,(+)-Gallocatechin,
-2000,1.5,mg,B,"Boron, B",
+id,rda,units,tagname,nutr_desc,anti_nutrient,weight
+203,60,g,PRO,Protein,,
+204,90,g,FAT,Total lipid (fat),,
+205,230,g,CARB,"Carbohydrate, by difference",,
+207,,g,ASH,Ash,,
+208,1850,kcal,CAL,Energy,t,-0.4
+209,,g,STARCH,Starch,,
+210,,g,SUCS,Sucrose,,
+211,,g,GLUS,Glucose (dextrose),,
+212,,g,FRUS,Fructose,,
+213,,g,LACS,Lactose,,
+214,,g,MALS,Maltose,,
+221,,g,ALC,"Alcohol, ethyl",,
+255,,g,WATER,Water,,
+262,,mg,CAFFN,Caffeine,,
+263,,mg,THEBRN,Theobromine,,
+268,,kJ,ENERC_KJ,Energy,,
+269,80,g,SUGAR,"Sugars, total",t,-0.5
+287,,g,GALS,Galactose,,
+291,30,g,FIBTG,"Fiber, total dietary",,
+301,1300,mg,CA,"Calcium, Ca",,
+303,18,mg,FE,"Iron, Fe",,
+304,420,mg,MG,"Magnesium, Mg",,
+305,1250,mg,P,"Phosphorus, P",,
+306,4700,mg,K,"Potassium, K",,
+307,1500,mg,NA,"Sodium, Na",t,-0.5
+309,11,mg,ZN,"Zinc, Zn",,
+312,0.9,mg,CU,"Copper, Cu",,
+313,,µg,FL,"Fluoride, F",t,-0.5
+315,2.3,mg,MN,"Manganese, Mn",,
+317,55,µg,SE,"Selenium, Se",,
+318,5000,IU,VITA_IU,"Vitamin A, IU",,
+319,,µg,RETOL,Retinol,,
+320,900,µg,VITA_RAE,"Vitamin A, RAE",,
+321,,µg,CARTB,"Carotene, beta",,
+322,,µg,CARTA,"Carotene, alpha",,
+323,,mg,TOCPHA,Vitamin E (alpha-tocopherol),,
+324,800,IU,VITD_IU,Vitamin D,,
+325,,µg,ERGCAL,Vitamin D2 (ergocalciferol),,
+326,,µg,CHOCAL,Vitamin D3 (cholecalciferol),,
+328,20,µg,VITD,Vitamin D (D2 + D3),,
+334,,µg,CRYPX,"Cryptoxanthin, beta",,
+337,3000,µg,LYCPN,Lycopene,,
+338,7000,µg,LUTZEA,Lutein + zeaxanthin,,
+341,,mg,TOCPHB,"Tocopherol, beta",,
+342,,mg,TOCPHG,"Tocopherol, gamma",,
+343,,mg,TOCPHD,"Tocopherol, delta",,
+344,,mg,TOCTRA,"Tocotrienol, alpha",,
+345,,mg,TOCTRB,"Tocotrienol, beta",,
+346,,mg,TOCTRG,"Tocotrienol, gamma",,
+347,,mg,TOCTRD,"Tocotrienol, delta",,
+401,90,mg,VITC,"Vitamin C, total ascorbic acid",,
+404,1.2,mg,B1,Thiamin,,
+405,1.3,mg,B2,Riboflavin,,
+406,16,mg,B3,Niacin,,
+410,5,mg,B5,Pantothenic acid,,
+415,1.7,mg,B6,Vitamin B-6,,
+417,400,µg,B9,"Folate, total",,
+418,2.4,µg,B12,Vitamin B-12,,
+421,550,mg,CHO,"Choline, total",,
+428,,µg,MK4,Menaquinone-4,,
+429,,µg,VITK1D,Dihydrophylloquinone,,
+430,120,µg,VITK,Vitamin K (phylloquinone),,
+431,,µg,FOLAC,Folic acid,,
+432,,µg,FOLFD,"Folate, food",,
+435,,µg,FOLDFE,"Folate, DFE",,
+454,,mg,BETN,Betaine,,
+501,0.3,g,TRP_G,Tryptophan,,
+502,1,g,THR_G,Threonine,,
+503,1.4,g,ILE_G,Isoleucine,,
+504,2.7,g,LEU_G,Leucine,,
+505,2.1,g,LYS_G,Lysine,,
+506,0.8,g,MET_G,Methionine,,
+507,,g,CYS_G,Cystine,,
+508,1.2,g,PHE_G,Phenylalanine,,
+509,1.4,g,TYR_G,Tyrosine,,
+510,1.8,g,VAL_G,Valine,,
+511,1,g,ARG_G,Arginine,,
+512,0.8,g,HISTN_G,Histidine,,
+513,1,g,ALA_G,Alanine,,
+514,1,g,ASP_G,Aspartic acid,,
+515,2,g,GLU_G,Glutamic acid,,
+516,0.8,g,GLY_G,Glycine,,
+517,0.6,g,PRO_G,Proline,,
+518,1.6,g,SER_G,Serine,,
+521,,g,HYP,Hydroxyproline,,
+573,,mg,VITE_ADD,"Vitamin E, added",,
+578,,µg,B12_ADD,"Vitamin B-12, added",,
+601,200,mg,CHOLEST,Cholesterol,t,-0.4
+605,,g,FATRN,"Fatty acids, total trans",t,-1.2
+606,30,g,FASAT,"Fatty acids, total saturated",t,-0.7
+607,,g,F4D0,4:0,,
+608,,g,F6D0,6:0,,
+609,,g,F8D0,8:0,,
+610,,g,F10D0,10:0,,
+611,,g,F12D0,12:0,,
+612,,g,F14D0,14:0,,
+613,,g,F16D0,16:0,,
+614,,g,F18D0,18:0,,
+615,,g,F20D0,20:0,,
+617,,g,F18D1,18:1 undifferentiated,,
+618,,g,F18D2,18:2 undifferentiated,,
+619,,g,F18D3,18:3 undifferentiated,,
+620,,g,F20D4,20:4 undifferentiated,,
+621,0.2,g,F22D6,22:6 n-3 (DHA),,
+624,,g,F22D0,22:0,,
+625,,g,F14D1,14:1,,
+626,,g,F16D1,16:1 undifferentiated,,
+627,,g,F18D4,18:4,,
+628,,g,F20D1,20:1,,
+629,0.1,g,F20D5,20:5 n-3 (EPA),,
+630,,g,F22D1,22:1 undifferentiated,,
+631,,g,F22D5,22:5 n-3 (DPA),,
+636,,mg,PHYSTR,Phytosterols,,
+638,,mg,STID7,Stigmasterol,,
+639,,mg,CAMD5,Campesterol,,
+641,,mg,SITSTR,Beta-sitosterol,,
+645,35,g,FAMS,"Fatty acids, total monounsaturated",,
+646,25,g,FAPU,"Fatty acids, total polyunsaturated",,
+652,,g,F15D0,15:0,,
+653,,g,F17D0,17:0,,
+654,,g,F24D0,24:0,,
+662,,g,F16D1T,16:1 t,,
+663,,g,F18D1T,18:1 t,,
+664,,g,F22D1T,22:1 t,,
+665,,g,F18D2NFD,18:2 t not further defined,,
+666,,g,F18D2I,18:2 i,,
+669,,g,F18D2TT,"18:2 t,t",,
+670,,g,F18D2CLA,18:2 CLAs,,
+671,,g,F24D1C,24:1 c,,
+672,,g,F20D2CN6,"20:2 n-6 c,c",,
+673,,g,F16D1C,16:1 c,,
+674,,g,F18D1C,18:1 c,,
+675,,g,F18D2CN6,"18:2 n-6 c,c",,
+676,,g,F22D1C,22:1 c,,
+685,,g,F18D3CN6,"18:3 n-6 c,c,c",,
+687,,g,F17D1,17:1,,
+689,,g,F20D3,20:3 undifferentiated,,
+693,,g,FATRNM,"Fatty acids, total trans-monoenoic",,
+695,,g,FATRNP,"Fatty acids, total trans-polyenoic",,
+696,,g,F13D0,13:0,,
+697,,g,F15D1,15:1,,
+851,2,g,F18D3CN3,"18:3 n-3 c,c,c (ALA)",,
+852,,g,F20D3N3,20:3 n-3,,
+853,,g,F20D3N6,20:3 n-6,,
+855,,g,F20D4N6,20:4 n-6,,
+856,,g,F18D3I,18:3i,,
+857,,g,F21D5,21:5,,
+858,,g,F22D4,22:4,,
+859,,g,F18D1TN7,18:1-11 t (18:1t n-7),,
+710,30,mg,DAID,Daidzein,,
+711,15,mg,GENI,Genistein,,
+712,,mg,GLYC,Glycitein,,
+713,45,mg,TOTISO,Total isoflavones,,
+714,,mg,BIOC,Biochanin A,,
+715,,mg,FORM,Formononetin,,
+716,,mg,COUM,Coumestrol,,
+734,5,mg,PAdimer,Proanthocyanidin dimers,,
+735,5,mg,PAtrimer,Proanthocyanidin trimers,,
+736,20,mg,PA4-6mer,Proanthocyanidin 4-6mers,,
+737,20,mg,PA7-10mer,Proanthocyanidin 7-10mers,,
+738,60,mg,PApolymer,Proanthocyanidin polymers (>10mers),,
+731,20,mg,CYAD,Cyanidin,,
+740,,mg,PETUNIDIN,Petunidin,,
+741,,mg,DELPH,Delphinidin ,,
+742,,mg,MALVIDIN,Malvidin,,
+743,,mg,PELA,Pelargonidin,,
+745,,mg,PEONIDIN,Peonidin,,
+749,40,mg,CATE,(+)-Catechin,,
+750,40,mg,EPICATEGC,(-)-Epigallocatechin,,
+751,40,mg,EPICATEC,(-)-Epicatechin,,
+752,40,mg,EPICATECG3,(-)-Epicatechin 3-gallate,,
+753,60,mg,EGCG,(-)-Epigallocatechin 3-gallate,,
+755,,mg,THEAF,Theaflavin,,
+756,,mg,THEAR,Thearubigins,,
+758,,mg,ERIOD,Eriodictyol,,
+759,80,mg,HESPT,Hesperetin,,
+762,60,mg,NARING,Naringenin,,
+770,30,mg,APIGEN,Apigenin,,
+773,20,mg,LUTEOL,Luteolin,,
+785,5,mg,ISORHAM,Isorhamnetin,,
+786,5,mg,KAEMF,Kaempferol,,
+788,2,mg,MYRIC,Myricetin,,
+789,20,mg,QUERCE,Quercetin,,
+791,,mg,THEA3DI,"Theaflavin-3,3'-digallate",,
+792,,mg,THEA3GP,Theaflavin-3'-gallate,,
+793,,mg,THEA3G,Theaflavin-3-gallate,,
+794,,mg,GALCATEGC,(+)-Gallocatechin,,
+2000,1.5,mg,B,"Boron, B",,

diff --git a/sql/tables.sql b/sql/tables.sql
index c5d1b384dc0be7547d188bfa54676ce0c50e766e..644f18f74401c30ae07b8e52ce629020d154e002 100644 (file)
--- a/sql/tables.sql
+++ b/sql/tables.sql
@@ -23,7 +23,6 @@ CREATE TABLE nutr_def (
   unit text NOT NULL,
   tagname text,
   nutr_desc text,
-  anti_nutrient boolean,
   num_dec int,
   sr_order int,
   flav_class text

diff --git a/sql/version.csv b/sql/version.csv
index 581793d1ebd6759381dafe56b087daaa5d2b31a6..316748e6cb4bb8a8c3db788a3ce4a5c1dd01864f 100644 (file)
--- a/sql/version.csv
+++ b/sql/version.csv
@@ -3,3 +3,4 @@ id,version,created
 2,0.0.1,Wed 05 Aug 2020 08:14:52 PM EDT
 3,0.0.2,Thu 06 Aug 2020 11:39:54 AM EDT
 4,0.0.3,Tue 11 Aug 2020 09:37:50 PM EDT
+5,0.0.4,Mon 07 Sep 2020 10:01:45 AM EDT