Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Take into account Dominance column for intercrops #28

Merged
merged 1 commit into from
Jul 18, 2024
Merged

Take into account Dominance column for intercrops #28

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions R/stics_wrapper.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,6 +628,7 @@ select_results <- function(keep_all_data, sit_var_dates_mask, var_names,
res$flag_rqd_res <- TRUE
res$simulate <- FALSE
return(res)

} else if (!is.null(sit_var_dates_mask) &&
is.null(sit_var_dates_mask[[situation]])) {

Expand All @@ -639,6 +640,7 @@ select_results <- function(keep_all_data, sit_var_dates_mask, var_names,
res$flag_rqd_res <- TRUE
res$simulate <- FALSE
return(res)

} else {

# some variables/dates explicitely required
Expand All @@ -657,9 +659,6 @@ select_results <- function(keep_all_data, sit_var_dates_mask, var_names,
## Convert required variables names to Stics variables names (i.e. handle ())
req_var_names <- SticsRFiles:::var_to_col_names(req_var_names)

## Add reserved keywords "Plant" and "Date" from the list
req_var_names <- unique(c(c("Date", "Plant"), req_var_names))

## Identify indexes of required variables among simulated ones
sim_var_names <- colnames(sim_tmp)
req_vars_idx <- sim_var_names %in% req_var_names
Expand All @@ -668,7 +667,9 @@ select_results <- function(keep_all_data, sit_var_dates_mask, var_names,

## In case some variables are not simulated, warn the user, add them in var.mod
## and re-simulate or select the results if var.mod has already been modified.
############################################################################
if (length(inter_var_names) < length(req_var_names)) {

if (varmod_modified) {
## var.mod has already been modified ... warn the user the required
## variables will not be simulated
Expand All @@ -686,16 +687,13 @@ select_results <- function(keep_all_data, sit_var_dates_mask, var_names,
))
res$flag_error <- FALSE
res$flag_rqd_res <- FALSE

} else {
## var.mod has not yet been modified ...
## try to modify it and resimulate (keyword simulate)

# TODO: check or set the flagecriture to 15 to get daily data results !!

## Remove the reserved keywords from required variables names so that
## they do not appear in warning message nor in var.mod
req_var_names <- req_var_names[!req_var_names %in% c("Date", "Plant")]

if (verbose) {
res$message <- warning(paste(
"Variable(s)",
Expand All @@ -720,14 +718,25 @@ select_results <- function(keep_all_data, sit_var_dates_mask, var_names,
res$varmod_modified <- TRUE
res$simulate <- TRUE
return(res)

}

}

## Select the results wrt to the required and simulated variables
## if required

### Add reserved keywords "Plant", "Date" and "Dominance" to the list
req_var_names <- unique(c(c("Date", "Plant", "Dominance"), req_var_names))
sim_var_names <- colnames(sim_tmp)
req_vars_idx <- sim_var_names %in% req_var_names

if (length(req_var_names) > 2) {

if (any(req_vars_idx)) {

sim_tmp <- sim_tmp[, req_vars_idx]

} else { ## no variable simulated, warn the user and return NULL

res$message <- warning(paste(
Expand All @@ -741,7 +750,9 @@ select_results <- function(keep_all_data, sit_var_dates_mask, var_names,
res$flag_rqd_res <- FALSE
res$simulate <- FALSE
return(res)

}

}


Expand Down
Loading