Adjusting estimation on rabbit feed use

fineprint-global · Jan 22, 2025 · 35db208 · 35db208
1 parent e8b07b9
commit 35db208
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/R/08_2_use_feed.R b/R/08_2_use_feed.R
@@ -365,16 +365,11 @@ feed_req[, `:=`(
   cakes_f = ifelse(is.na(cakes_f), mean(cakes_f, na.rm = TRUE), cakes_f),
   scavenging_f = ifelse(is.na(scavenging_f), mean(scavenging_f, na.rm = TRUE), scavenging_f))]
 # This simple procedure assumes equal feed composition for
-# Horses, Asses, Mules, Camels, Camelids, other
-feed_req[item_code != 0 & !proc %in% c("Rabbits husbandry", "Rodents husbandry, other"),
+# Horses, Asses, Mules, Camels, Camelids, other, "Rabbits husbandry", "Rodents husbandry, other"
+feed_req[item_code != 0,
          `:=`(animals = total * animals_f, crops = total * crops_f,
               grass = total * grass_f, fodder = total * fodder_f, cakes = total * cakes_f,
               scavenging = total * scavenging_f)]
-# Rabbits and hares, Rodents, other
-feed_req[item_code != 0 & proc %in% c("Rabbits husbandry", "Rodents husbandry, other"),
-         `:=`(animals = total * animals_f, crops = total * (crops_f + grass_f),
-              grass = 0, fodder = total * fodder_f, cakes = total * cakes_f,
-              scavenging = total * scavenging_f)]
 
 # Kick factors again
 feed_req[, `:=`(animals_f = NULL, crops_f = NULL, grass_f = NULL,