Fix module numbering

AgroCares · May 3, 2024 · 80e4cc1 · 80e4cc1
1 parent 24dab1c
commit 80e4cc1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/R/model.R b/R/model.R
@@ -171,16 +171,16 @@ calculateCost <- function(doses, fields, fertilizers, fines, reduce_batches = TR
   module1 <- calculateCostModule1(doses, fields, fertilizers)
 
 
-  # Module 4: Revenue from harvested crops ----------------------------------
-  module4 <- calculateRevenueModule4(doses, fields, fertilizers)
+  # Module 5: Revenue from harvested crops ----------------------------------
+  module5 <- calculateRevenueModule5(doses, fields, fertilizers)
 
 
-  # Module 5: Penalty for exceeding legal limit -----------------------------
-  module5 <- calculatePenaltyModule5(doses, fields, fertilizers, fines)
+  # Module 6: Penalty for exceeding legal limit -----------------------------
+  module6 <- calculatePenaltyModule6(doses, fields, fertilizers, fines)
 
 
   # Combine the modules -----------------------------------------------------
-  cost <- torch::torch_zeros(dim(module1)) + module1 - module4 + module5
+  cost <- torch::torch_zeros(dim(module1)) + module1 - module5 + module6
 
 
   # Convert to € / ha -------------------------------------------------------
@@ -218,8 +218,8 @@ calculateCostModule1 <- function(doses, fields, fertilizers) {
   return(module1)
 }
 
-# Module 4: Revenue from harvested crops  ------------------------------------
-calculateRevenueModule4 <- function(doses, fields, fertilizers) {
+# Module 5: Revenue from harvested crops  ------------------------------------
+calculateRevenueModule5 <- function(doses, fields, fertilizers) {
 
   # Calculate N dose per fields
   fertilizers.p_n_rt <- fertilizers[,,3]
@@ -275,14 +275,14 @@ calculateRevenueModule4 <- function(doses, fields, fertilizers) {
   fields.b_area <- fields[,,1]
   fields.b_lu_yield <- fields[,,8]
   fields.b_lu_price <- fields[,,9]
-  module4 <- fields.b_area *  fields.b_lu_yield * fields.b_lu_price * fields.d_realized
-  module4 <- torch::torch_sum(module4, dim = 2L)
+  module5 <- fields.b_area *  fields.b_lu_yield * fields.b_lu_price * fields.d_realized
+  module5 <- torch::torch_sum(module5, dim = 2L)
 
-  return(module4)
+  return(module5)
 }
 
-# Module 5: Penalties in case of exceeding legal limits -----------------------
-calculatePenaltyModule5 <- function(doses, fields, fertilizers, fines) {
+# Module 6: Penalties in case of exceeding legal limits -----------------------
+calculatePenaltyModule6 <- function(doses, fields, fertilizers, fines) {
 
   # Calculate d_n_norm_man per field
   fertilizers.p_n_rt <- fertilizers[,,3]
@@ -337,9 +337,9 @@ calculatePenaltyModule5 <- function(doses, fields, fertilizers, fines) {
 
 
   # Combine the penalties
-  module5 <- farms.penalty.d_n_norm_man + farms.penalty.d_n_norm + farms.penalty.d_p_norm
+  module6 <- farms.penalty.d_n_norm_man + farms.penalty.d_n_norm + farms.penalty.d_p_norm
 
-  return(module5)
+  return(module6)
 }
 
 
diff --git a/tests/testthat/test-002-model.R b/tests/testthat/test-002-model.R
@@ -36,18 +36,18 @@ test_that("Calculate cost for module 1: Purchase of fertilizers", {
   expect_length(as.numeric(module1), farms_count)
 })
 
-module4 <- calculateRevenueModule4(doses, fields, fertilizers)
+module5 <- calculateRevenueModule5(doses, fields, fertilizers)
 
-test_that("Calculate revenue for module 4: Revenue of harvested crops", {
-  expect_contains(class(module4), 'torch_tensor')
-  expect_length(as.numeric(module4), farms_count)
+test_that("Calculate revenue for module 5: Revenue of harvested crops", {
+  expect_contains(class(module5), 'torch_tensor')
+  expect_length(as.numeric(module5), farms_count)
 })
 
-module5 <- calculatePenaltyModule5(doses, fields, fertilizers, fines)
+module6 <- calculatePenaltyModule6(doses, fields, fertilizers, fines)
 
-test_that("Calculate penalties for module 5: Penalties for exceeding legal limits", {
-  expect_contains(class(module5), 'torch_tensor')
-  expect_length(as.numeric(module5), farms_count)
+test_that("Calculate penalties for module 6: Penalties for exceeding legal limits", {
+  expect_contains(class(module6), 'torch_tensor')
+  expect_length(as.numeric(module6), farms_count)
 })
 
 cost <- calculateCost(doses, fields, fertilizers, fines)