hestia-earth-models 0.62.1__py3-none-any.whl → 0.62.2__py3-none-any.whl

hestia_earth/models/site/management.py

@@ -18,13 +18,14 @@ from functools import reduce
 from hestia_earth.schema import SchemaType, TermTermType
 from hestia_earth.utils.api import download_hestia
 from hestia_earth.utils.model import filter_list_term_type, linked_node
-from hestia_earth.utils.tools import flatten, safe_parse_float
+from hestia_earth.utils.tools import safe_parse_float
 from hestia_earth.utils.blank_node import get_node_value
 
 from hestia_earth.models.log import logRequirements, logShouldRun, log_blank_nodes_id
 from hestia_earth.models.utils.term import get_lookup_value
 from hestia_earth.models.utils.blank_node import condense_nodes
 from hestia_earth.models.utils.site import related_cycles
+from hestia_earth.models.utils.site import get_land_cover_term_id as get_landCover_term_id_from_site_type
 from . import MODEL
 
 REQUIREMENTS = {
@@ -130,14 +131,16 @@ def _extract_node_value(node: dict) -> dict:
     return node | {'value': get_node_value(node)}
 
 
-def _include(value: dict, keys: list): return {k: v for k, v in value.items() if k in keys}
+def _include(value: dict, keys: list) -> dict: return {k: v for k, v in value.items() if k in keys}
 
 
-def _default_dates(cycle: dict, values: list):
+def _default_dates(cycle: dict, values: list) -> list:
+    """Only uses the dates from the cycle if they are missing from the item."""
     return [(_include(cycle, ["startDate", "endDate"]) | v) for v in values]
 
 
 def _overwrite_dates(cycle: dict, values: list) -> list:
+    """Always uses the dates from the cycle."""
     return [v | _include(cycle, ["startDate", "endDate"]) for v in values]
 
 
@@ -149,22 +152,21 @@ def _copy_item_if_exists(source: dict, keys: list[str] = None, dest: dict = None
 
 def _get_landCover_term_id(product: dict) -> str:
     value = get_lookup_value(product.get('term', {}), LAND_COVER_KEY, model=MODEL, model_key=LAND_COVER_KEY)
-    # TODO: what should happen when there are multiple values?
     return value.split(';')[0] if value else None
 
 
-def _get_items_with_relevant_term_type(
-        cycles: list[dict], item_name: str, relevant_values: list, date_fill: callable = _default_dates
-):
-    """Get items from the list of cycles with any of the relevant values. Also adds dates if missing."""
-    return flatten(
-        [
-            date_fill(
-                cycle=cycle,
-                values=filter_list_term_type(cycle.get(item_name, []), relevant_values)
-            ) for cycle in cycles
-        ]
-    )
+def _get_relevant_items(
+    cycles: list[dict], item_name: str, relevant_terms: list, date_fill: callable = _default_dates
+) -> list[tuple]:
+    """
+    Get items (optionally in tuples with site_type) from the list of cycles with any of the relevant terms.
+    Also adds dates if missing.
+    """
+    return [
+        (item, cycle.get("site", {}).get("siteType", ""))
+        for cycle in cycles
+        for item in date_fill(cycle=cycle, values=filter_list_term_type(cycle.get(item_name, []), relevant_terms))
+    ]
 
 
 def _get_lookup_with_debug(term: dict, column: str) -> any:
@@ -211,27 +213,23 @@ def _get_relevant_inputs(cycles: list[dict]) -> list:
     return relevant_inputs
 
 
-def _should_run(site: dict):
-    # Only get related cycles once.
-    cycles = related_cycles(site)
-
+def _should_run_all_products(cycles):
     products_land_cover = [
         _extract_node_value(
             _include(
                 value=product,
                 keys=["term", "value", "startDate", "endDate", "properties"]
             )
-        ) for product in _get_items_with_relevant_term_type(
+        ) for product, _ in _get_relevant_items(
             cycles=cycles,
             item_name="products",
-            relevant_values=[TermTermType.LANDCOVER]
+            relevant_terms=[TermTermType.LANDCOVER]
         )
     ]
-
-    products_crop_forage = _get_items_with_relevant_term_type(
+    products_crop_forage = _get_relevant_items(
         cycles=cycles,
         item_name="products",
-        relevant_values=[TermTermType.CROP, TermTermType.FORAGE],
+        relevant_terms=[TermTermType.CROP, TermTermType.FORAGE],
         date_fill=_overwrite_dates
     )
     products_crop_forage = [
@@ -243,9 +241,33 @@ def _should_run(site: dict):
                 "value": 100
             }
         )
-        for product in list(filter(_get_landCover_term_id, products_crop_forage))
+        for product in list(filter(_get_landCover_term_id, [i[0] for i in products_crop_forage]))
     ]
-    all_products = products_land_cover + products_crop_forage
+    products_animal_with_site_type = _get_relevant_items(
+        cycles=cycles,
+        item_name="products",
+        relevant_terms=[TermTermType.LIVEANIMAL, TermTermType.ANIMALPRODUCT]
+    )
+    products_animal = [
+        _copy_item_if_exists(
+            source=product,
+            keys=["startDate", "endDate", "properties"],
+            dest={
+                "term": linked_node(download_hestia(get_landCover_term_id_from_site_type(site_type))),
+                "value": 100
+            }
+        )
+        for product, site_type in products_animal_with_site_type if product
+    ]
+
+    return products_animal, products_crop_forage, products_land_cover
+
+
+def _should_run(site: dict):
+    cycles = related_cycles(site)
+
+    products_animal, products_crop_forage, products_land_cover = _should_run_all_products(cycles)
+    all_products = products_land_cover + products_crop_forage + products_animal
     all_products = condense_nodes(all_products)
 
     practices = [
@@ -254,10 +276,10 @@ def _should_run(site: dict):
                 value=practice,
                 keys=["term", "value", "startDate", "endDate"]
             )
-        ) for practice in _get_items_with_relevant_term_type(
+        ) for practice, _ in _get_relevant_items(
             cycles=cycles,
             item_name="practices",
-            relevant_values=[
+            relevant_terms=[
                 TermTermType.WATERREGIME,
                 TermTermType.TILLAGE,
                 TermTermType.CROPRESIDUEMANAGEMENT,
@@ -275,6 +297,7 @@ def _should_run(site: dict):
         model_key=MODEL_KEY,
         products_crop_forage_ids=log_blank_nodes_id(products_crop_forage),
         products_land_cover_ids=log_blank_nodes_id(products_land_cover),
+        products_animal=log_blank_nodes_id(products_animal),
         practice_ids=log_blank_nodes_id(practices),
         inputs=log_blank_nodes_id(relevant_inputs)
     )

hestia_earth/models/utils/blank_node.py

@@ -41,6 +41,44 @@ from .lookup import (
 from .term import get_lookup_value
 
 
+def lookups_logs(model: str, blank_nodes: list, lookups_per_termType: dict, **log_args):
+    def mapper(blank_node: dict):
+        term = blank_node.get('term', {})
+        term_id = term.get('@id')
+        term_type = term.get('termType')
+        lookups = lookups_per_termType.get(term_type, [])
+        lookups = lookups if isinstance(lookups, list) else [lookups]
+
+        def _reduce_lookups_logs(logs: dict, column: str):
+            lookup_value = get_lookup_value(term, column, model=model, **log_args)
+            return logs | {column: lookup_value}
+
+        return reduce(_reduce_lookups_logs, lookups, {'id': term_id})
+
+    logs = list(map(mapper, blank_nodes))
+
+    return log_as_table(logs)
+
+
+def properties_logs(blank_nodes: list, properties: Union[dict, list]):
+    def mapper(blank_node: dict):
+        term = blank_node.get('term', {})
+        term_id = term.get('@id')
+        term_type = term.get('termType')
+        props = properties.get(term_type, []) if isinstance(properties, dict) else properties
+        props = props if isinstance(props, list) else [props]
+
+        def _reduce_properties_logs(logs: dict, prop: str):
+            value = get_node_property(term, prop).get('value')
+            return logs | {prop: value}
+
+        return reduce(_reduce_properties_logs, properties, {'id': term_id})
+
+    logs = list(map(mapper, blank_nodes))
+
+    return log_as_table(logs)
+
+
 def group_by_keys(group_keys: list = ['term']):
     def run(group: dict, node: dict):
         group_key = '-'.join(non_empty_list(map(lambda v: node.get(v, {}).get('@id'), group_keys)))

hestia_earth/models/utils/property.py

@@ -87,17 +87,17 @@ def node_has_property(term_id: str):
     return lambda product: find_term_match(product.get('properties', []), term_id, None) is not None
 
 
-def node_property_lookup_value(model: str, term: dict, prop_id: str, default=None, **log_args):
+def node_property_lookup_value(model: str, node_term: dict, prop_id: str, default=None, **log_args):
     # as the lookup table might not exist, we are making sure we return `0` in thise case
     try:
-        lookup_name = f"{term.get('termType')}-property.csv"
+        lookup_name = f"{node_term.get('termType')}-property.csv"
         lookup = download_lookup(lookup_name)
-        term_id = term.get('@id')
+        term_id = node_term.get('@id')
         lookup_value = get_table_value(lookup, 'termid', term_id, column_name(prop_id))
         value = extract_grouped_data(lookup_value, 'Avg') if (
             isinstance(lookup_value, str) and 'Avg' in lookup_value
         ) else lookup_value
-        debugMissingLookup(lookup_name, 'termid', term_id, prop_id, value, model=model, term=term_id, **log_args)
+        debugMissingLookup(lookup_name, 'termid', term_id, prop_id, value, model=model, **log_args)
         return safe_parse_float(value, default=None)
     except Exception:
         return default
@@ -111,9 +111,9 @@ def get_node_property_value(model: str, node: dict, prop_id: str, default=None,
     return default if value is None else (value / 100 if units == '%' else value)
 
 
-def get_node_property_value_converted(model: str, node: dict, prop_id: str, default=None):
+def get_node_property_value_converted(model: str, node: dict, prop_id: str, default=None, **log_args):
     node_value = list_sum(node.get('value', []))
-    prop_value = get_node_property_value(model, node, prop_id)
+    prop_value = get_node_property_value(model, node, prop_id, **log_args)
     return default if prop_value is None else node_value * prop_value
 
 

hestia_earth/models/utils/site.py

@@ -5,6 +5,7 @@ from hestia_earth.utils.tools import non_empty_list, flatten, safe_parse_date
 
 from hestia_earth.models.log import debugMissingLookup
 from . import cached_value, _load_calculated_node
+from .term import get_land_cover_siteTypes
 
 CACHE_YEARS_KEY = 'years'
 WATER_TYPES = [
@@ -120,3 +121,9 @@ def region_factor(model: str, region_id: str, term_id: str, termType: TermTermTy
     value = get_table_value(download_lookup(lookup_name), 'termid', region_id, column_name(term_id))
     debugMissingLookup(lookup_name, 'termid', region_id, term_id, value, model=model, term=term_id)
     return value
+
+
+def get_land_cover_term_id(site_type: str):
+    land_cover_terms = get_land_cover_siteTypes()
+    term = next((term for term in land_cover_terms if term["name"].lower() == site_type.lower()), {})
+    return term.get('@id')

hestia_earth/models/utils/term.py

@@ -1,4 +1,4 @@
-from hestia_earth.schema import SchemaType, TermTermType
+from hestia_earth.schema import SchemaType, TermTermType, SiteSiteType
 from hestia_earth.utils.lookup import download_lookup, get_table_value, column_name
 from hestia_earth.utils.api import find_node, search
 
@@ -625,3 +625,23 @@ def get_electricity_grid_mix_terms():
             ],
         }
     }, limit=LIMIT, fields=['@type', '@id', 'name', 'termType', 'units'])
+
+
+def get_land_cover_siteTypes():
+    """
+    Find all `Land Cover` terms with siteTypes
+
+    Returns
+    -------
+        List of landCover terms with associated siteTypes.
+    """
+    return search({
+        "bool": {
+            "must": [
+                {"match": {"@type": "Term"}},
+                {"match": {"termType": "landCover"}}
+            ],
+            "should": [{"match": {"name": siteType.value}} for siteType in SiteSiteType],
+            "minimum_should_match": 1
+        },
+    })

hestia_earth/models/version.py

@@ -1 +1 @@
-VERSION = '0.62.1'
+VERSION = '0.62.2'

{hestia_earth_models-0.62.1.dist-info → hestia_earth_models-0.62.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.62.1
+Version: 0.62.2
 Summary: Hestia's set of modules for filling gaps in the activity data using external datasets (e.g. populating soil properties with a geospatial dataset using provided coordinates) and internal lookups (e.g. populating machinery use from fuel use). Includes rules for when gaps should be filled versus not (e.g. never gap fill yield, gap fill crop residue if yield provided etc.).
 Home-page: https://gitlab.com/hestia-earth/hestia-engine-models
 Author: Hestia Team

{hestia_earth_models-0.62.1.dist-info → hestia_earth_models-0.62.2.dist-info}/RECORD

@@ -4,7 +4,7 @@ hestia_earth/models/cache_sites.py,sha256=KQp9cUKE-aIcYJoMWEtKFYS8gBFfsx5LKQhqoW
 hestia_earth/models/log.py,sha256=b63I3qyTtQs17xxbq8RI0Fv2lvZ1oDZ9k0njhxqiFFk,3459
 hestia_earth/models/preload_requests.py,sha256=elhYQTxBVuFlZROWvZ3yErDzzMLdMUIjBhmpdaTUSi8,1012
 hestia_earth/models/requirements.py,sha256=znNZJAhwX2iYiKcAQXPftY7z_1MsNa0QxCXkXyHm_U0,17363
-hestia_earth/models/version.py,sha256=PWB3A1c15lnJ0vIqLFnOlwunRfvIyeg_7b4mAWh_mKI,19
+hestia_earth/models/version.py,sha256=EWenFVQCLj6zgrn-xqhR8lwtUw0XKd0Vbw0vYPdiKVc,19
 hestia_earth/models/agribalyse2016/__init__.py,sha256=WvK0qCQbnYtg9oZxrACd1wGormZyXibPtpCnIQeDqbw,415
 hestia_earth/models/agribalyse2016/fuelElectricity.py,sha256=mrh8seYSYdTgcMDCETLiknuPeJehg071YoG4UiyW0yU,4404
 hestia_earth/models/agribalyse2016/machineryInfrastructureDepreciatedAmountPerCycle.py,sha256=_Rbngu0DzHKa62JwBl58ZC_ui1zLF2que_nB7ukhOQc,3392
@@ -35,9 +35,9 @@ hestia_earth/models/cml2001NonBaseline/eutrophicationPotentialIncludingFateAvera
 hestia_earth/models/cml2001NonBaseline/terrestrialAcidificationPotentialExcludingFate.py,sha256=y6aIHefYOBiw_9HeH_jLozxej9p3LVQAPYJz6Cz6zig,1029
 hestia_earth/models/cycle/__init__.py,sha256=VowO3kOHb0LpURsljNaJsYO7s6vgjhul6bF_85UjUEI,406
 hestia_earth/models/cycle/aboveGroundCropResidueTotal.py,sha256=9swq4YEeJQ2YjVOmghgBYWkMZWdNU4MKCUBY5FsmBSU,3088
-hestia_earth/models/cycle/coldCarcassWeightPerHead.py,sha256=SaTHq8AC3o8HylfN0LE1ird2e5ylz4Jo5pcGL2MJCEI,2913
-hestia_earth/models/cycle/coldDressedCarcassWeightPerHead.py,sha256=9i52CQHiqZjFYcW1IwKUAgJvFkUvp0BZT_z3Ik-HiSM,3041
-hestia_earth/models/cycle/concentrateFeed.py,sha256=TBhBuh98WYrzMEajXyuFRTdVq_pnp0fokCCqL67nfmk,5594
+hestia_earth/models/cycle/coldCarcassWeightPerHead.py,sha256=fQ7huuxyS5PQkRmR_tRCOz9rV3LJwLfLQJjH_TcTz6k,2955
+hestia_earth/models/cycle/coldDressedCarcassWeightPerHead.py,sha256=k0xg5SIfJGwEKteFr2Fh-lh8yDC_sqQw_lBnnfwl9zU,3069
+hestia_earth/models/cycle/concentrateFeed.py,sha256=wiq9KLRuipHz_2_CVfXDuUek0JN1ZPSyKSimtJntG9E,5636
 hestia_earth/models/cycle/cropResidueManagement.py,sha256=QTRCCFu9VvD_a3_8aAj216vsuhAJEhlAwTJH7ifMkDo,2237
 hestia_earth/models/cycle/cycleDuration.py,sha256=9EvmdBdyjgKqiMi643PMVPvlrzRInP00WKiB2hv96NQ,3016
 hestia_earth/models/cycle/energyContentLowerHeatingValue.py,sha256=AyVKCQbb3Pto3Ca__F0KJ_wlwTxbPd7mUyehZW7AJPM,2212
@@ -50,7 +50,7 @@ hestia_earth/models/cycle/liveAnimal.py,sha256=LWAMnNKRoLDdChrGApVIN-Ns7em0Lspz5
 hestia_earth/models/cycle/milkYield.py,sha256=RhzePjkvEAGicTzRA4eatc0K_4NSGHhyEhYF0EbbGXw,5820
 hestia_earth/models/cycle/pastureGrass.py,sha256=7PrmDMJPtsbKGa8WIOh_4NXNtbH3Pxb23pmjawQuY9o,1226
 hestia_earth/models/cycle/pastureSystem.py,sha256=uksVgl_3bp_t2niwZ5BvS3VT-Kndx26Se6GpzqG0bX8,2709
-hestia_earth/models/cycle/readyToCookWeightPerHead.py,sha256=F4UtK1gSsIYqbQ1V2hSUszSrq2HFN5LdMB33Yc-bfTQ,2927
+hestia_earth/models/cycle/readyToCookWeightPerHead.py,sha256=R1Rt3WsTzwnI2Bqljx03RpdG0A1-bGV4M7EqmcP7Dzg,2955
 hestia_earth/models/cycle/residueBurnt.py,sha256=HwU1D9ibiIul-FlXDUcEMDEc_KxpB8ug0SLz-4rXxKk,2106
 hestia_earth/models/cycle/residueIncorporated.py,sha256=9_s2RMOy5D20eq9ziDBEA_Y7RiFFMeK0bDJ65CW4qlE,2763
 hestia_earth/models/cycle/residueLeftOnField.py,sha256=qYxKGAdUORN7Vjqj7AZC2VGV_rM3MN0-padDGhgjiNU,2175
@@ -79,7 +79,7 @@ hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioCarbon.py,sha25
 hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioDryMatter.py,sha256=zf-v-cAPLpSe7sr1auzUUXkjXwpXRTVvsCrzbZrwBI8,2388
 hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioEnergy.py,sha256=C6ZyjZDUHU4UlIr6tlvHoCQfsC5jRQ87U7stSn95jzA,1984
 hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioFedWeight.py,sha256=7Dss1AIbG7GimQ3-Ecv2wsx1PrblZhHFYhMHWoyvPc4,2140
-hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioNitrogen.py,sha256=Mgur-o_ki1deMukBS5-ngeqdCIYVBE36kOiY-jB42EY,2581
+hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioNitrogen.py,sha256=RV7lLd4PiFRCkH83-DvuZKnOCA9bXbYOcDHea8Wz4LY,2603
 hestia_earth/models/cycle/input/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hestia_earth/models/cycle/input/hestiaAggregatedData.py,sha256=7WhSOTUKq9A6mrDwOu5gMOHtkhK0oby8n-DAO4LaWLs,5035
 hestia_earth/models/cycle/input/properties.py,sha256=r5EF18b_KW8evmdlev0mLQyqwBVgSicKEyilGaBRF6I,3017
@@ -246,13 +246,13 @@ hestia_earth/models/ipcc2019/noxToAirInorganicFertiliser.py,sha256=fmmFgjtvOD2Tr
 hestia_earth/models/ipcc2019/noxToAirOrganicFertiliser.py,sha256=9dx_MRTwJGxJRq6mj2EJQMdQ2w6j7lw0fQk0If_cIGc,4152
 hestia_earth/models/ipcc2019/organicCarbonPerHa.py,sha256=8rQifRZYQdoBz9HpoSbmrKiGP7ayQUZT78KEErgqtwc,8658
 hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_1_utils.py,sha256=B7pwVkpt2YTo49yImTAQ4rr_Lu03zaPb5LEDKm0WJJI,82431
-hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_2_utils.py,sha256=Zb3c5Wby1ZrRXs4n9qPgP04oIRZn9EUjkH65uRSk8Dc,58015
-hestia_earth/models/ipcc2019/organicCarbonPerHa_utils.py,sha256=CrQWsDhW--wNQ2HEc_zxdFKuIdBHEwOQnVJGA3HgPpQ,10856
-hestia_earth/models/ipcc2019/pastureGrass.py,sha256=VXUqbvNmRWJy-oTD2ENj8wxhZ-YWivNMxjk4znt5t74,9344
-hestia_earth/models/ipcc2019/pastureGrass_utils.py,sha256=ITQSFQ0zLCqbrKoMuYQ9MaP_-F768uNKdltf5zZCwUs,15833
+hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_2_utils.py,sha256=m_8eJGKENUBs6oXnGpCXecUe7T5ke_jUoREKRsJV4_0,63542
+hestia_earth/models/ipcc2019/organicCarbonPerHa_utils.py,sha256=jIhRks8ewCtQNIIN89N_4A4Tp529YMQnk4YmZV6FOCY,10668
+hestia_earth/models/ipcc2019/pastureGrass.py,sha256=Dg94o-tMVR-SWW6dIK5kwbV4pcMBHEWtcSS2JhAtpXY,9491
+hestia_earth/models/ipcc2019/pastureGrass_utils.py,sha256=TqGHj4yZmEO6cVV3VeqSTl11TGRpipnliMMUIOqTy1k,13744
 hestia_earth/models/ipcc2019/utils.py,sha256=MSDMu15D9DnilFUgi4_6jYXC0FaKso3OODauGTMB6hs,6229
 hestia_earth/models/ipcc2019/animal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hestia_earth/models/ipcc2019/animal/pastureGrass.py,sha256=ej1cyJKUqSFP5CsdV0iU_ucpGxN4VWbaw2caKi0rtoE,10966
+hestia_earth/models/ipcc2019/animal/pastureGrass.py,sha256=QyT0qRO0lAJJU0Tp3PlDtXzbs7J6BXSX9kWo57T9GMw,11417
 hestia_earth/models/ipcc2019/animal/weightAtMaturity.py,sha256=5smSAmKVCIlELCD6S_3I16YuSWNFhcClGDOdvrIuYsE,3657
 hestia_earth/models/ipcc2021/__init__.py,sha256=VTgGFKhwMmk_nuI1RRq0in27fHYVPBonlXlPK00K8no,409
 hestia_earth/models/ipcc2021/gwp100.py,sha256=v-DYU-11XnWI1Ns1GEiKrJqL3JafxvhTsLmuBuFcxJU,1021
@@ -366,7 +366,7 @@ hestia_earth/models/linkedImpactAssessment/landTransformationFromPermanentPastur
 hestia_earth/models/linkedImpactAssessment/utils.py,sha256=dGwGc2d-8_WQElTpfyPmz5vQtL-LHQRmiZnCTuPXMDs,1876
 hestia_earth/models/mocking/__init__.py,sha256=n3Fkkrvh8zHNWiJZmnfQ7WZ91JRzAO9P6pSG1JpwtXo,687
 hestia_earth/models/mocking/mock_search.py,sha256=dBCDRfbZmbMLKP21u_VYkxyimomqs-zztjX-_ZNKuuM,2036
-hestia_earth/models/mocking/search-results.json,sha256=GyPI-u-c5vWqHmSgPI2684DgFvpNJgLRNiZb91wu3uE,43624
+hestia_earth/models/mocking/search-results.json,sha256=b5j1ibEDk4nfn9QJf9d_C6ZQoAvEKkUpHkbcWFHYqC4,46685
 hestia_earth/models/pooreNemecek2018/__init__.py,sha256=nPboL7ULJzL5nJD5q7q9VOZt_fxbKVm8fmn1Az5YkVY,417
 hestia_earth/models/pooreNemecek2018/aboveGroundCropResidueTotal.py,sha256=Qt-mel4dkhK6N5uUOutNOinCTFjbjtGzITaaI0LvYc4,2396
 hestia_earth/models/pooreNemecek2018/belowGroundCropResidue.py,sha256=JT0RybbvWVlo01FO8K0Yj41HrEaJT3Kj1xfayr2X-xw,2315
@@ -465,7 +465,7 @@ hestia_earth/models/site/brackishWater.py,sha256=vLEhIZv5PUKwzwvIuYrWi7K---fq7ZX
 hestia_earth/models/site/cationExchangeCapacityPerKgSoil.py,sha256=0eH4A-tXJ0hvIkiYXWxlx8TfrdbIKUGYUDk97-yQJgg,3653
 hestia_earth/models/site/flowingWater.py,sha256=v3g5722GIA4zQAUQI9yGFiZvFvI1QAVZqlQrY-6_B3A,1731
 hestia_earth/models/site/freshWater.py,sha256=FXs3Vt8V4e-wn325_dwSTOKlZtn5ksNUpvYGDeLJShY,1255
-hestia_earth/models/site/management.py,sha256=iljb0YjZqQcilXNlYIffjfEqszvMaLRKJlgv0TKIe-M,9627
+hestia_earth/models/site/management.py,sha256=ithImDcKKNvSk3ACxChQCasy_KLPcBWlQa4wo4hQLqU,10666
 hestia_earth/models/site/netPrimaryProduction.py,sha256=UIIQkYd911qVzrWjxBLrC37e-RARIVgDwLdARY9BuLw,1849
 hestia_earth/models/site/organicCarbonPerHa.py,sha256=O6t4D3Jj1kjMIBOpnIrJ58kzUP_FIlpMUEFKQAeS77c,14916
 hestia_earth/models/site/organicCarbonPerKgSoil.py,sha256=t--wAshiAKS-JvEKhLFRadGvgSBv5NFZ68jdyms_wh4,1945
@@ -528,7 +528,7 @@ hestia_earth/models/utils/aggregated.py,sha256=sz6usleZmo_tC_hIvmGgYsX8-H0dulXmm
 hestia_earth/models/utils/animalProduct.py,sha256=M5IunAKGY6oZv3j1Ascl34ywyeLWApqOIlBzbtlA2FE,721
 hestia_earth/models/utils/aquacultureManagement.py,sha256=dxrbC1Xf140cohxTbSw6TxLAnAASWTdNZwBBam4yQnw,171
 hestia_earth/models/utils/array_builders.py,sha256=0_Ik0gKoh1QBijyb-55odh8_dIs-CWQ3lgUN1Hnc4Y8,18749
-hestia_earth/models/utils/blank_node.py,sha256=TpjIepoRvHnffOjmv-N4HjYyMLCdUBGVrzwoPVCB3S8,43013
+hestia_earth/models/utils/blank_node.py,sha256=XpuFGyXGC_0TrilR2JM7NI6Na2mlUgx7hcAQt8ke7nQ,44415
 hestia_earth/models/utils/completeness.py,sha256=2-GusD9UycobDZq8y5jar0ZcOjyqnSbzPRT_5XMc4YA,1259
 hestia_earth/models/utils/constant.py,sha256=7wn5LBdsqlLdCrPaVASYjsxNtbaOSdqVWKedOFgyzfY,3249
 hestia_earth/models/utils/crop.py,sha256=kG054fryqPSBpmzvJFBy_CLiOdjrt7RMk5uTItO5ADg,2246
@@ -555,11 +555,11 @@ hestia_earth/models/utils/pesticideAI.py,sha256=6f8b-dFm3qr-eY049_eOvj_iDk4XBam6
 hestia_earth/models/utils/practice.py,sha256=tNadOzsrNlCEt801B815XaruJXzZ5yPASam7B3sWpXE,1091
 hestia_earth/models/utils/product.py,sha256=H9UqJNzTqtMWXDQnbRkZlTpv_hg4s-Tya469fBk8InA,10143
 hestia_earth/models/utils/productivity.py,sha256=bUBVCZInGqHuHZvHDSYPQkjWXQxOtTjEk-1-f_BsFOo,594
-hestia_earth/models/utils/property.py,sha256=gHPEmy3Sw599ox64Gv-LCvjhP1THlBXBaBlTOK5lvog,5060
-hestia_earth/models/utils/site.py,sha256=yei3qk7edxb_boag9h8j713r06KGstjTBWdb1KjqMus,3602
+hestia_earth/models/utils/property.py,sha256=_9Wy0oZIBLsa-jOiGLokKehYLNdz-_7LfLaE4fb6SWM,5085
+hestia_earth/models/utils/site.py,sha256=uPOA6uLLqVQdHIY2LynaiXWL4FHxfDQWcPBk3v7Jby8,3870
 hestia_earth/models/utils/source.py,sha256=Y-CcO5Y3q5Hz4A4RdX35C1EUjL9w1NKnOrzVfOWQ7nU,1748
 hestia_earth/models/utils/temperature.py,sha256=ljlG4-yCgFFb6LRZweb18cZKLrr7K2mqd4E4Hz_D1f8,476
-hestia_earth/models/utils/term.py,sha256=n_T1Qp_0z9ZUgrbVACNKue-5yDePOCkDw8g8dlMKSTM,17763
+hestia_earth/models/utils/term.py,sha256=YBUu1QVGOt4FieSDp0aF4U6F-LTuyBGdci6LkEypi48,18278
 hestia_earth/models/utils/transformation.py,sha256=nyT5Mz4_VgFwhkL8JoNX9kxxow0zuxzsYl3W8xOu2p0,370
 hestia_earth/models/webbEtAl2012AndSintermannEtAl2012/__init__.py,sha256=Niv7ZFMBCwThlbCKGOwA17QdkpOUDFrqrFItGNqnZAA,434
 hestia_earth/models/webbEtAl2012AndSintermannEtAl2012/nh3ToAirOrganicFertiliser.py,sha256=TGXyusrRd9shT842iqbrI6MkQhICgw7uYdrl4jsDrg8,4193
@@ -795,9 +795,9 @@ tests/models/ipcc2019/test_no3ToGroundwaterInorganicFertiliser.py,sha256=e7REnQ9
 tests/models/ipcc2019/test_no3ToGroundwaterOrganicFertiliser.py,sha256=e1ZViD12qB3bLdH3TJw3GbBP8iqMen-UJbcFkytb3VQ,1609
 tests/models/ipcc2019/test_noxToAirInorganicFertiliser.py,sha256=NZBSBJLM_j2PEpHRON2ysgKNF8x5sHfQVoAKQdGsfzk,1537
 tests/models/ipcc2019/test_noxToAirOrganicFertiliser.py,sha256=LR5pjV5vRbgSSQAw8kYRp_ij4CHInzgaDS6EggQuBiw,1104
-tests/models/ipcc2019/test_organicCarbonPerHa.py,sha256=PJ3l2LexjybgA3IIYzYYZ01akYq5EjmCT4y6JYavL54,13989
+tests/models/ipcc2019/test_organicCarbonPerHa.py,sha256=9i1xEv5QEc8C9e0c0iVGwLOWisZVYwwlnAsEVmMv5Lg,13245
 tests/models/ipcc2019/test_organicCarbonPerHa_tier_1_utils.py,sha256=e5RpK4GlH9tNxbwEyPQkO2lMwYBtGNp8ha8j4bZF9eg,20699
-tests/models/ipcc2019/test_organicCarbonPerHa_tier_2_utils.py,sha256=gHAi0qr9vE2_TtyJOqOc5Wc8ZRIflQz8vKBOcvKTzCE,7020
+tests/models/ipcc2019/test_organicCarbonPerHa_tier_2_utils.py,sha256=6YXLqH5wz_cvYlJjCacCv9UTYpnXYxURLKQz6N9ZMPg,6807
 tests/models/ipcc2019/test_organicCarbonPerHa_utils.py,sha256=Zd2QlN_Q3k9djuByOH62A00tryVzlvNtsd46N79TTeU,1778
 tests/models/ipcc2019/test_pastureGrass.py,sha256=xcFXpszkqgeJImWOp-JlJxpcSHQKC-Pi0zdaKfai4a4,2660
 tests/models/ipcc2019/animal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -1008,7 +1008,7 @@ tests/models/site/test_brackishWater.py,sha256=YGCp4glaWudKklYBSp-50KbfvIRtp3F4Q
 tests/models/site/test_cationExchangeCapacityPerKgSoil.py,sha256=tNMhN998vcjQ15I-5mNnFh2d7mHzEBIBO6o1VSfQNUE,1075
 tests/models/site/test_flowingWater.py,sha256=t_rxvdlmUVDsFBoDF20_zDM-0iiLKkNCV7knO9l1T7o,1370
 tests/models/site/test_freshWater.py,sha256=GOeAxHhPW_2E1wQdQRX4W-r7mnb_LgmiAVLImitoApw,982
-tests/models/site/test_management.py,sha256=1ecEbbHNmzA-qSw9-d_sGi-j64FXOCxUm1WLSEmPJHU,12659
+tests/models/site/test_management.py,sha256=lQKPxzP3pmGTeIjlGb-191BlPLRV_2uUDBi9fMOFMIg,13458
 tests/models/site/test_netPrimaryProduction.py,sha256=JCxG0MODbKVvl3hOqmKzh4FjHYn3Xs9KsVod6LvKQII,1108
 tests/models/site/test_organicCarbonPerHa.py,sha256=XtGrE7ZqthTF0x8lDxJ1slNd_GvYHEyEydcRgA46jEc,3207
 tests/models/site/test_organicCarbonPerKgSoil.py,sha256=0M-NMg_T3UXzGT_VlKOKhSxg4cZ0_zhd3FRgY5Hpj6o,1087
@@ -1087,8 +1087,8 @@ tests/models/utils/test_source.py,sha256=mv3vHZV5cjpoLA2I1109-YUkuzAiuhbRSnv_76_
 tests/models/utils/test_term.py,sha256=M5Sa26v2gzQYbZ4H_fo7DspnaCx__-WtL-MULGapCWk,3509
 tests/models/webbEtAl2012AndSintermannEtAl2012/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/webbEtAl2012AndSintermannEtAl2012/test_nh3ToAirOrganicFertiliser.py,sha256=qi2FNXS5Af2WDtm7nq_FsprH3BfCF0XxnE0XHmC4aIY,2244
-hestia_earth_models-0.62.1.dist-info/LICENSE,sha256=AC7h7GAgCZGJK_Tzh6LUCrML9gQEfowWwecEw2w54QM,1154
-hestia_earth_models-0.62.1.dist-info/METADATA,sha256=qY8BwGkgTl3hz-Z_6-hq_wEHb2H6bnDiHbC2MdBwu1Q,3350
-hestia_earth_models-0.62.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-hestia_earth_models-0.62.1.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.62.1.dist-info/RECORD,,
+hestia_earth_models-0.62.2.dist-info/LICENSE,sha256=AC7h7GAgCZGJK_Tzh6LUCrML9gQEfowWwecEw2w54QM,1154
+hestia_earth_models-0.62.2.dist-info/METADATA,sha256=epzR-hLk8p2bP7MCqfgrEir5gUJGU4eJjuDnSL7TX0U,3350
+hestia_earth_models-0.62.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+hestia_earth_models-0.62.2.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.62.2.dist-info/RECORD,,

tests/models/ipcc2019/test_organicCarbonPerHa.py

@@ -28,13 +28,6 @@ COVER_CROP_PROPERTY_TERM_IDS = [
     "shortFallowCrop"
 ]
 
-CROP_RESIDUE_INCORP_TERM_IDS = [
-    "aboveGroundCropResidueIncorporated",
-    "aboveGroundCropResidueLeftOnField",
-    "belowGroundCropResidue",
-    "discardedCropIncorporated",
-    "discardedCropLeftOnField"
-]
 
 IRRIGATED_TERM_IDS = [
     "rainfedDeepWater",
@@ -104,6 +97,7 @@ def order_list(values: list[dict]) -> list[dict]:
 PARAMS_SHOULD_RUN = [
     ("tier-1-and-2/cropland", True),
     ("tier-1-and-2/with-zero-carbon-input", True),                   # Closes issue 777
+    ("tier-1-and-2/with-residues-removed", True),                    # Closes issue #758 and #846
     ("tier-1/cropland-depth-as-float", True),
     ("tier-1/cropland-with-measured-soc", True),
     ("tier-1/cropland-without-measured-soc", True),
@@ -130,6 +124,7 @@ PARAMS_SHOULD_RUN = [
 IDS_SHOULD_RUN = [p[0] for p in PARAMS_SHOULD_RUN]
 
 
+# TODO: update mocks
 @mark.parametrize("subfolder, should_run", PARAMS_SHOULD_RUN, ids=IDS_SHOULD_RUN)
 @patch(f"{term_path}.search")
 @patch(f"{property_path}.download_hestia")
@@ -138,13 +133,11 @@ IDS_SHOULD_RUN = [p[0] for p in PARAMS_SHOULD_RUN]
 @patch(f"{utils_path}.get_upland_rice_crop_terms", return_value=UPLAND_RICE_CROP_TERM_IDS)
 @patch(f"{utils_path}.get_residue_removed_or_burnt_terms", return_value=RESIDUE_REMOVED_OR_BURNT_TERM_IDS)
 @patch(f"{utils_path}.get_irrigated_terms", return_value=IRRIGATED_TERM_IDS)
-@patch(f"{utils_path}.get_crop_residue_incorporated_or_left_on_field_terms", return_value=CROP_RESIDUE_INCORP_TERM_IDS)
 @patch(f"{utils_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
 @patch(f"{tier_2_path}.related_cycles")
 def test_should_run(
     mock_related_cycles: MagicMock,
     mock_get_cover_crop_property_terms: MagicMock,  # utils mocks
-    mock_get_crop_residue_incorporated_or_left_on_field_terms: MagicMock,
     mock_get_irrigated_terms: MagicMock,
     mock_get_residue_removed_or_burnt_terms: MagicMock,
     mock_get_upland_rice_crop_terms: MagicMock,
@@ -172,7 +165,6 @@ def test_should_run(
 
     # Ensure that API calls to retrieve term IDs are properly cached.
     mock_get_cover_crop_property_terms.call_count <= 1
-    mock_get_crop_residue_incorporated_or_left_on_field_terms.call_count <= 1
     mock_get_irrigated_terms.call_count <= 1
     mock_get_residue_removed_or_burnt_terms.call_count <= 1
     mock_get_upland_rice_crop_terms.call_count <= 1
@@ -206,6 +198,7 @@ def test_should_run_no_data(
 PARAMS_RUN = [subfolder for subfolder, should_run in PARAMS_SHOULD_RUN if should_run]
 
 
+# TODO: update mocks
 @mark.parametrize("subfolder", PARAMS_RUN)
 @patch(f"{term_path}.search")
 @patch(f"{property_path}.download_hestia")
@@ -214,7 +207,6 @@ PARAMS_RUN = [subfolder for subfolder, should_run in PARAMS_SHOULD_RUN if should
 @patch(f"{utils_path}.get_upland_rice_crop_terms", return_value=UPLAND_RICE_CROP_TERM_IDS)
 @patch(f"{utils_path}.get_residue_removed_or_burnt_terms", return_value=RESIDUE_REMOVED_OR_BURNT_TERM_IDS)
 @patch(f"{utils_path}.get_irrigated_terms", return_value=IRRIGATED_TERM_IDS)
-@patch(f"{utils_path}.get_crop_residue_incorporated_or_left_on_field_terms", return_value=CROP_RESIDUE_INCORP_TERM_IDS)
 @patch(f"{utils_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
 @patch(f"{tier_2_path}.related_cycles")
 @patch(f"{tier_2_path}.calc_descriptive_stats", side_effect=fake_calc_descriptive_stats)
@@ -232,7 +224,6 @@ def test_run(
     _mock_calc_descriptive_stats_t2: MagicMock,
     mock_related_cycles: MagicMock,
     mock_get_cover_crop_property_terms: MagicMock,  # utils mocks
-    mock_get_crop_residue_incorporated_or_left_on_field_terms: MagicMock,
     mock_get_irrigated_terms: MagicMock,
     mock_get_residue_removed_or_burnt_terms: MagicMock,
     mock_get_upland_rice_crop_terms: MagicMock,
@@ -263,7 +254,6 @@ def test_run(
 
     # Ensure that API calls to retrieve term IDs are properly cached.
     mock_get_cover_crop_property_terms.call_count <= 1
-    mock_get_crop_residue_incorporated_or_left_on_field_terms.call_count <= 1
     mock_get_irrigated_terms.call_count <= 1
     mock_get_residue_removed_or_burnt_terms.call_count <= 1
     mock_get_upland_rice_crop_terms.call_count <= 1
@@ -277,13 +267,15 @@ def test_run(
 
 
 PARAMS_RUN_WITH_STATS = [
-    "tier-1-and-2/with-stats",              # Closes issue 753
-    "tier-1/cropland-with-stats",           # Closes issue 753
-    "tier-1/land-use-change-with-stats",    # Closes issue 753
-    "tier-2/with-stats"                     # Closes issue 753
+    "tier-1-and-2/with-stats",                        # Closes issue 753
+    "tier-1-and-2/with-residues-removed-with-stats",  # Closes issue #758 and #846
+    "tier-1/cropland-with-stats",                     # Closes issue 753
+    "tier-1/land-use-change-with-stats",              # Closes issue 753
+    "tier-2/with-stats"                               # Closes issue 753
 ]
 
 
+# TODO: update mocks
 @mark.parametrize("subfolder", PARAMS_RUN_WITH_STATS)
 @patch(f"{term_path}.search")
 @patch(f"{property_path}.download_hestia")
@@ -292,7 +284,6 @@ PARAMS_RUN_WITH_STATS = [
 @patch(f"{utils_path}.get_upland_rice_crop_terms", return_value=UPLAND_RICE_CROP_TERM_IDS)
 @patch(f"{utils_path}.get_residue_removed_or_burnt_terms", return_value=RESIDUE_REMOVED_OR_BURNT_TERM_IDS)
 @patch(f"{utils_path}.get_irrigated_terms", return_value=IRRIGATED_TERM_IDS)
-@patch(f"{utils_path}.get_crop_residue_incorporated_or_left_on_field_terms", return_value=CROP_RESIDUE_INCORP_TERM_IDS)
 @patch(f"{utils_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
 @patch(f"{tier_2_path}.related_cycles")
 @patch(f"{tier_2_path}._new_measurement", side_effect=fake_new_measurement)
@@ -302,7 +293,6 @@ def test_run_with_stats(
     _mock_new_measurement_t2: MagicMock,
     mock_related_cycles: MagicMock,
     mock_get_cover_crop_property_terms: MagicMock,  # utils mocks
-    mock_get_crop_residue_incorporated_or_left_on_field_terms: MagicMock,
     mock_get_irrigated_terms: MagicMock,
     mock_get_residue_removed_or_burnt_terms: MagicMock,
     mock_get_upland_rice_crop_terms: MagicMock,
@@ -333,7 +323,6 @@ def test_run_with_stats(
 
     # Ensure that API calls to retrieve term IDs are properly cached.
     mock_get_cover_crop_property_terms.call_count <= 1
-    mock_get_crop_residue_incorporated_or_left_on_field_terms.call_count <= 1
     mock_get_irrigated_terms.call_count <= 1
     mock_get_residue_removed_or_burnt_terms.call_count <= 1
     mock_get_upland_rice_crop_terms.call_count <= 1

tests/models/ipcc2019/test_organicCarbonPerHa_tier_2_utils.py

@@ -25,14 +25,6 @@ YEARS = 100
 MONTHS = 12
 
 
-CROP_RESIDUE_INCORP_TERM_IDS = [
-    "aboveGroundCropResidueIncorporated",
-    "aboveGroundCropResidueLeftOnField",
-    "belowGroundCropResidue",
-    "discardedCropIncorporated",
-    "discardedCropLeftOnField"
-]
-
 IRRIGATED_TERM_IDS = [
     "rainfedDeepWater",
     "rainfedDeepWaterWaterDepth100Cm",

tests/models/site/test_management.py

@@ -17,8 +17,24 @@ TERM_BY_ID = {
     'oatPlant': {'@type': 'Term', '@id': 'oatPlant', 'termType': TermTermType.LANDCOVER.value},
     'agatiTree': {'@type': 'Term', '@id': 'agatiTree', 'termType': TermTermType.LANDCOVER.value},
     'wildGarlicPlant': {'@type': 'Term', '@id': 'wildGarlicPlant', 'termType': TermTermType.LANDCOVER.value},
+    'permanentPasture': {
+        "@type": "Term",
+        "@id": "permanentPasture",
+        "name": "Permanent pasture",
+        "termType": TermTermType.LANDCOVER.value,
+        "units": "% area"
+    },
+    'animalHousing': {
+        "@type": "Term",
+        "@id": "animalHousing",
+        "name": "Animal housing",
+        "termType": TermTermType.LANDCOVER.value,
+        "units": "% area"
+    }
 }
 
+LAND_COVER_TERM_BY_SITE_TYPE = {"permanent pasture": "permanentPasture", "animal housing": "animalHousing"}
+
 
 def lookup_side_effect(*args, **kwargs):
     # Values taken from real lookups.
@@ -270,7 +286,7 @@ def test_should_run(mock_related_cycles, *args):
         ("Example 2", f"{fixtures_folder}/inputs/example2"),
         ("Example 3", f"{fixtures_folder}/inputs/example3"),
         ("Example 4", f"{fixtures_folder}/inputs/example4"),
-        ("Condense Nodes", f"{fixtures_folder}/inputs/condense_nodes")
+        ("Condense Nodes", f"{fixtures_folder}/inputs/condense_nodes"),
         # Expected:
         #   - appleTree (81) x 3 condenses 2020-03-01 to 2021-02-15
         #   - animalManureUsed (true) x 2 condenses 2001-04-01 to 2001-12-31
@@ -282,12 +298,24 @@ def test_should_run(mock_related_cycles, *args):
         #   - sassafrasTree (86) x 2 condenses 2001-01-01 to 2004-12-31
         #   - bananaPlant (87) does not condense [non-consecutive years]
         #   - durianTree (89) does not condense [dates overwritten See 808]
+        ("Site Type", f"{fixtures_folder}/inputs/site_type")
     ]
 )
-@patch(f"{CLASS_PATH}.download_hestia", side_effect=lambda id, *args: TERM_BY_ID[id])
+@patch(
+    f"{CLASS_PATH}.get_landCover_term_id_from_site_type",
+    side_effect=lambda site_type: LAND_COVER_TERM_BY_SITE_TYPE[site_type]
+)
+@patch(f"{CLASS_PATH}.download_hestia", side_effect=lambda term_id, *args: TERM_BY_ID[term_id])
 @patch(f"{CLASS_PATH}.related_cycles")
 @patch(f"{CLASS_PATH}._get_lookup_with_debug", side_effect=lookup_side_effect)
-def test_run(mock_get_lookup_with_debug, mock_related_cycles, mock_download, test_name, fixture_path):
+def test_run(
+        mock_get_lookup_with_debug,
+        mock_related_cycles,
+        mock_download,
+        mock_land_cover_lookup,
+        test_name,
+        fixture_path
+):
     with open(f"{fixture_path}/cycles.jsonld", encoding='utf-8') as f:
         cycles = json.load(f)
     mock_related_cycles.return_value = cycles