Run make all-all

kaiiam · Jun 20, 2024 · 879d6d0 · 879d6d0
1 parent 5df59db
commit 879d6d0
Show file tree

Hide file tree

Showing 22 changed files with 780 additions and 818 deletions.
diff --git a/examples/output/Container-Component-001.json b/examples/output/Container-Component-001.json
@@ -1,71 +1,71 @@
 {
   "components": [
     {
-      "component_id": "FDC:167512",
+      "component_sample_id": "FDC:167512",
       "component_type": "COMPONENT:1003",
       "component_recorded_value": 5.88,
       "component_measurement_unit": "g/(100.g)",
       "component_data_points_number": 1,
       "component_derivation_type": "Analytical"
     },
     {
-      "component_id": "FDC:167512",
+      "component_sample_id": "FDC:167512",
       "component_type": "COMPONENT:1007",
       "component_recorded_value": 3.5,
       "component_measurement_unit": "kcal/(100.g)",
       "component_data_points_number": 1,
       "component_derivation_type": "Analytical"
     },
     {
-      "component_id": "FDC:167512",
+      "component_sample_id": "FDC:167512",
       "component_type": "COMPONENT:1062",
       "component_recorded_value": 1286.0,
       "component_measurement_unit": "kJ/(100.g)",
       "component_data_points_number": 2,
       "component_derivation_type": "Analytical"
     },
     {
-      "component_id": "FDC:167512",
+      "component_sample_id": "FDC:167512",
       "component_type": "COMPONENT:1079",
       "component_recorded_value": 1.2,
       "component_measurement_unit": "mg/(100.g)",
       "component_data_points_number": 0,
       "component_derivation_type": "Calculated"
     },
     {
-      "component_id": "FDC:167512",
+      "component_sample_id": "FDC:167512",
       "component_type": "COMPONENT:1089",
       "component_recorded_value": 2.12,
       "component_measurement_unit": "ug/(100.g)",
       "component_data_points_number": 1,
       "component_derivation_type": "Estimated"
     },
     {
-      "component_id": "FDC:167513",
+      "component_sample_id": "FDC:167513",
       "component_type": "COMPONENT:1003",
       "component_recorded_value": 4.34,
       "component_measurement_unit": "g/(100.g)",
       "component_data_points_number": 2,
       "component_derivation_type": "Analytical"
     },
     {
-      "component_id": "FDC:167513",
+      "component_sample_id": "FDC:167513",
       "component_type": "COMPONENT:1007",
       "component_recorded_value": 3.08,
       "component_measurement_unit": "g/(100.g)",
       "component_data_points_number": 1,
       "component_derivation_type": "Analytical"
     },
     {
-      "component_id": "FDC:167513",
+      "component_sample_id": "FDC:167513",
       "component_type": "COMPONENT:1062",
       "component_recorded_value": 1381.0,
       "component_measurement_unit": "g/(100.g)",
       "component_data_points_number": 0,
       "component_derivation_type": "Sourced from literature"
     },
     {
-      "component_id": "FDC:167513",
+      "component_sample_id": "FDC:167513",
       "component_type": "COMPONENT:1079",
       "component_recorded_value": 1.4,
       "component_measurement_unit": "g/(100.g)",
@@ -77,7 +77,7 @@
       "laboratory_sample_aggregation_median_measured_compound_value": 1.5
     },
     {
-      "component_id": "FDC:167513",
+      "component_sample_id": "FDC:167513",
       "component_type": "COMPONENT:1089",
       "component_recorded_value": 1.93,
       "component_measurement_unit": "g/(100.g)",

diff --git a/examples/output/Container-Component-001.yaml b/examples/output/Container-Component-001.yaml
@@ -1,53 +1,53 @@
 components:
-- component_id: FDC:167512
+- component_sample_id: FDC:167512
   component_type: COMPONENT:1003
   component_recorded_value: 5.88
   component_measurement_unit: g/(100.g)
   component_data_points_number: 1
   component_derivation_type: Analytical
-- component_id: FDC:167512
+- component_sample_id: FDC:167512
   component_type: COMPONENT:1007
   component_recorded_value: 3.5
   component_measurement_unit: kcal/(100.g)
   component_data_points_number: 1
   component_derivation_type: Analytical
-- component_id: FDC:167512
+- component_sample_id: FDC:167512
   component_type: COMPONENT:1062
   component_recorded_value: 1286.0
   component_measurement_unit: kJ/(100.g)
   component_data_points_number: 2
   component_derivation_type: Analytical
-- component_id: FDC:167512
+- component_sample_id: FDC:167512
   component_type: COMPONENT:1079
   component_recorded_value: 1.2
   component_measurement_unit: mg/(100.g)
   component_data_points_number: 0
   component_derivation_type: Calculated
-- component_id: FDC:167512
+- component_sample_id: FDC:167512
   component_type: COMPONENT:1089
   component_recorded_value: 2.12
   component_measurement_unit: ug/(100.g)
   component_data_points_number: 1
   component_derivation_type: Estimated
-- component_id: FDC:167513
+- component_sample_id: FDC:167513
   component_type: COMPONENT:1003
   component_recorded_value: 4.34
   component_measurement_unit: g/(100.g)
   component_data_points_number: 2
   component_derivation_type: Analytical
-- component_id: FDC:167513
+- component_sample_id: FDC:167513
   component_type: COMPONENT:1007
   component_recorded_value: 3.08
   component_measurement_unit: g/(100.g)
   component_data_points_number: 1
   component_derivation_type: Analytical
-- component_id: FDC:167513
+- component_sample_id: FDC:167513
   component_type: COMPONENT:1062
   component_recorded_value: 1381.0
   component_measurement_unit: g/(100.g)
   component_data_points_number: 0
   component_derivation_type: Sourced from literature
-- component_id: FDC:167513
+- component_sample_id: FDC:167513
   component_type: COMPONENT:1079
   component_recorded_value: 1.4
   component_measurement_unit: g/(100.g)
@@ -59,7 +59,7 @@ components:
   laboratory_sample_aggregation_minimum_measured_compound_value: 0.8
   laboratory_sample_aggregation_maximum_measured_compound_value: 2.2
   laboratory_sample_aggregation_median_measured_compound_value: 1.5
-- component_id: FDC:167513
+- component_sample_id: FDC:167513
   component_type: COMPONENT:1089
   component_recorded_value: 1.93
   component_measurement_unit: g/(100.g)

diff --git a/examples/output/Container-Component-002.json b/examples/output/Container-Component-002.json
@@ -1,39 +1,39 @@
 {
   "components": [
     {
-      "component_id": "FDC:167512",
+      "component_sample_id": "FDC:167512",
       "component_type": "COMPONENT:1003",
       "component_recorded_value": 5.88,
       "component_measurement_unit": "g/(100.g)",
       "component_data_points_number": 1,
       "compound_analytical_measurement_method": "HPLC"
     },
     {
-      "component_id": "FDC:167512",
+      "component_sample_id": "FDC:167512",
       "component_type": "COMPONENT:1007",
       "component_recorded_value": 3.5,
       "component_measurement_unit": "kcal/(100.g)",
       "component_data_points_number": 1,
       "compound_analytical_measurement_method": "GC"
     },
     {
-      "component_id": "FDC:167512",
+      "component_sample_id": "FDC:167512",
       "component_type": "COMPONENT:1062",
       "component_recorded_value": 1286.0,
       "component_measurement_unit": "kJ/(100.g)",
       "component_data_points_number": 2,
       "compound_analytical_measurement_method": "GLC"
     },
     {
-      "component_id": "FDC:167512",
+      "component_sample_id": "FDC:167512",
       "component_type": "COMPONENT:1079",
       "component_recorded_value": 1.2,
       "component_measurement_unit": "mg/(100.g)",
       "component_data_points_number": 0,
       "compound_analytical_measurement_method": "Nephelometry"
     },
     {
-      "component_id": "FDC:167512",
+      "component_sample_id": "FDC:167512",
       "component_type": "COMPONENT:1089",
       "component_recorded_value": 2.12,
       "component_measurement_unit": "ug/(100.g)",
@@ -42,7 +42,7 @@
       "compound_analytical_measurement_method": "Gravimetric"
     },
     {
-      "component_id": "FDC:167513",
+      "component_sample_id": "FDC:167513",
       "component_type": "COMPONENT:1003",
       "component_recorded_value": 4.34,
       "component_measurement_unit": "g/(100.g)",
@@ -51,15 +51,15 @@
       "compound_analytical_measurement_method": "Fluorometric"
     },
     {
-      "component_id": "FDC:167513",
+      "component_sample_id": "FDC:167513",
       "component_type": "COMPONENT:1007",
       "component_recorded_value": 3.08,
       "component_measurement_unit": "g/(100.g)",
       "component_data_points_number": 1,
       "compound_analytical_measurement_method": "Kjeldahl"
     },
     {
-      "component_id": "FDC:167513",
+      "component_sample_id": "FDC:167513",
       "component_type": "COMPONENT:1062",
       "component_recorded_value": 1381.0,
       "component_measurement_unit": "g/(100.g)",
@@ -68,15 +68,15 @@
       "compound_analytical_measurement_method": "HPLC"
     },
     {
-      "component_id": "FDC:167513",
+      "component_sample_id": "FDC:167513",
       "component_type": "COMPONENT:1079",
       "component_recorded_value": 1.4,
       "component_measurement_unit": "g/(100.g)",
       "component_data_points_number": 6,
       "compound_analytical_measurement_method": "HPLC"
     },
     {
-      "component_id": "FDC:167513",
+      "component_sample_id": "FDC:167513",
       "component_type": "COMPONENT:1089",
       "component_recorded_value": 1.93,
       "component_measurement_unit": "g/(100.g)",

diff --git a/examples/output/Container-Component-002.yaml b/examples/output/Container-Component-002.yaml
@@ -1,62 +1,62 @@
 components:
-- component_id: FDC:167512
+- component_sample_id: FDC:167512
   component_type: COMPONENT:1003
   component_recorded_value: 5.88
   component_measurement_unit: g/(100.g)
   component_data_points_number: 1
   compound_analytical_measurement_method: HPLC
-- component_id: FDC:167512
+- component_sample_id: FDC:167512
   component_type: COMPONENT:1007
   component_recorded_value: 3.5
   component_measurement_unit: kcal/(100.g)
   component_data_points_number: 1
   compound_analytical_measurement_method: GC
-- component_id: FDC:167512
+- component_sample_id: FDC:167512
   component_type: COMPONENT:1062
   component_recorded_value: 1286.0
   component_measurement_unit: kJ/(100.g)
   component_data_points_number: 2
   compound_analytical_measurement_method: GLC
-- component_id: FDC:167512
+- component_sample_id: FDC:167512
   component_type: COMPONENT:1079
   component_recorded_value: 1.2
   component_measurement_unit: mg/(100.g)
   component_data_points_number: 0
   compound_analytical_measurement_method: Nephelometry
-- component_id: FDC:167512
+- component_sample_id: FDC:167512
   component_type: COMPONENT:1089
   component_recorded_value: 2.12
   component_measurement_unit: ug/(100.g)
   component_data_points_number: 1
   compound_analytical_measurement_protocol_doi: ' AOAC 934.06 mod'
   compound_analytical_measurement_method: Gravimetric
-- component_id: FDC:167513
+- component_sample_id: FDC:167513
   component_type: COMPONENT:1003
   component_recorded_value: 4.34
   component_measurement_unit: g/(100.g)
   component_data_points_number: 2
   compound_analytical_measurement_protocol_doi: AOAC 985.01 + 984.27
   compound_analytical_measurement_method: Fluorometric
-- component_id: FDC:167513
+- component_sample_id: FDC:167513
   component_type: COMPONENT:1007
   component_recorded_value: 3.08
   component_measurement_unit: g/(100.g)
   component_data_points_number: 1
   compound_analytical_measurement_method: Kjeldahl
-- component_id: FDC:167513
+- component_sample_id: FDC:167513
   component_type: COMPONENT:1062
   component_recorded_value: 1381.0
   component_measurement_unit: g/(100.g)
   component_data_points_number: 0
   compound_analytical_measurement_protocol_doi: AOAC 996.06
   compound_analytical_measurement_method: HPLC
-- component_id: FDC:167513
+- component_sample_id: FDC:167513
   component_type: COMPONENT:1079
   component_recorded_value: 1.4
   component_measurement_unit: g/(100.g)
   component_data_points_number: 6
   compound_analytical_measurement_method: HPLC
-- component_id: FDC:167513
+- component_sample_id: FDC:167513
   component_type: COMPONENT:1089
   component_recorded_value: 1.93
   component_measurement_unit: g/(100.g)

diff --git a/examples/output/Container-Component-003.json b/examples/output/Container-Component-003.json
@@ -1,25 +1,21 @@
 {
   "components": [
     {
-      "laboratory_sample_id": "CY124QU",
-      "laboratory_sample_aliquot_id": "NFY122JPN",
-      "laboratory_sample_batch_id": "o",
-      "component_id": "167512",
+      "component_sample_id": "CY124QU",
       "component_type": "COMPONENT:1075",
       "component_type_label": "galactose",
       "component_recorded_value": 0.52,
       "component_measurement_unit": "g/(100.g)",
       "component_data_points_number": 1,
       "component_analysis_date": "March 8, 2023",
       "compound_analytical_measurement_protocol_doi": "SUGR-GALAC-CHG",
-      "laboratory_conducting_analytical_analysis": "Silliker",
-      "component_quality_control_remeasurement": false
+      "compound_analytical_laboratory_name": "Silliker",
+      "component_quality_control_remeasurement": false,
+      "food_laboratory_sample_aliquot_id": "NFY122JPN",
+      "food_laboratory_sample_batch_id": "o"
     },
     {
-      "laboratory_sample_id": "CY124QX",
-      "laboratory_sample_aliquot_id": "NFY122JRQ",
-      "laboratory_sample_batch_id": "o",
-      "component_id": "167513",
+      "component_sample_id": "CY124QX",
       "component_type": "COMPONENT:1014",
       "component_type_label": "maltose",
       "component_recorded_value": 0.0,
@@ -28,13 +24,12 @@
       "component_analysis_date": "March 9, 2023",
       "component_limit_of_quantitation": "<0.25",
       "compound_analytical_measurement_protocol_doi": "SUGR-DP1-2-CHG",
-      "laboratory_conducting_analytical_analysis": "Silliker"
+      "compound_analytical_laboratory_name": "Silliker",
+      "food_laboratory_sample_aliquot_id": "NFY122JRQ",
+      "food_laboratory_sample_batch_id": "o"
     },
     {
-      "laboratory_sample_id": "CY124R2",
-      "laboratory_sample_aliquot_id": "NFY122JV9",
-      "laboratory_sample_batch_id": "q",
-      "component_id": "167514",
+      "component_sample_id": "CY124R2",
       "component_type": "COMPONENT:1011",
       "component_type_label": "glucose",
       "component_recorded_value": 0.0,
@@ -43,8 +38,10 @@
       "component_analysis_date": "March 17, 2023",
       "component_limit_of_quantitation": "<0.25",
       "compound_analytical_measurement_protocol_doi": "SUGR-DP1-2-CHG",
-      "laboratory_conducting_analytical_analysis": "Silliker",
-      "component_quality_control_remeasurement": true
+      "compound_analytical_laboratory_name": "Silliker",
+      "component_quality_control_remeasurement": true,
+      "food_laboratory_sample_aliquot_id": "NFY122JV9",
+      "food_laboratory_sample_batch_id": "q"
     }
   ],
   "@type": "Container"