diff --git a/modules/Anomalies/Anomalies.R b/modules/Anomalies/Anomalies.R index 2d54365a6e611291fc355a918de30c0e3e24a1b9..d5f11228eea9b354bfd70132fc6958a7bfa99b0d 100644 --- a/modules/Anomalies/Anomalies.R +++ b/modules/Anomalies/Anomalies.R @@ -1,6 +1,3 @@ -## TODO: Remove in the next release -source("modules/Anomalies/compute_anomalies.R") - # Compute the hcst, obs and fcst anomalies with or without cross-validation # and return them, along with the hcst and obs climatologies. diff --git a/modules/Anomalies/compute_anomalies.R b/modules/Anomalies/compute_anomalies.R deleted file mode 100644 index 2ef36a34086a9bc270f09740a337438370a43950..0000000000000000000000000000000000000000 --- a/modules/Anomalies/compute_anomalies.R +++ /dev/null @@ -1,7 +0,0 @@ -compute_anomalies <- function(recipe, data) { - warning(paste0("The function compute_anomalies() has been renamed to: ", - "'Anomalies()'. The name 'compute_anomalies()' will be ", - "deprecated in the next release. Please change your scripts ", - "accordingly.")) - return(Anomalies(recipe, data)) -} diff --git a/modules/Calibration/Calibration.R b/modules/Calibration/Calibration.R index 16d7b96b190fad0f2e80f48c6195ec61416447b3..f1362a22c7608ca95322351d5ba1ea5422792670 100644 --- a/modules/Calibration/Calibration.R +++ b/modules/Calibration/Calibration.R @@ -1,6 +1,3 @@ -## TODO: Remove in the next release -source("modules/Calibration/calibrate_datasets.R") - Calibration <- function(recipe, data) { # Function that calibrates the hindcast using the method stated in the # recipe. If the forecast is not null, it calibrates it as well. diff --git a/modules/Calibration/calibrate_datasets.R b/modules/Calibration/calibrate_datasets.R deleted file mode 100644 index 8264992f949788b40e6bd6d5bfd5471b1536f1e5..0000000000000000000000000000000000000000 --- a/modules/Calibration/calibrate_datasets.R +++ /dev/null @@ -1,7 +0,0 @@ -calibrate_datasets <- function(recipe, data) { - warning(paste0("The function calibrate_datasets() has been renamed to: ", - "'Calibration()'. The name 'calibrate_datasets' will be ", - "deprecated in the next release. Please change your scripts ", - "accordingly.")) - return(Calibration(recipe, data)) -} diff --git a/modules/Loading/Loading.R b/modules/Loading/Loading.R index 6c4002ee9f10d291acdd36f9dfe6996eea15be26..6e219bf13b09a6d2888b8edb4095b1f78b875ee0 100644 --- a/modules/Loading/Loading.R +++ b/modules/Loading/Loading.R @@ -1,6 +1,4 @@ source("tools/libs.R") -## TODO: Remove with the next release -source("modules/Loading/load_datasets.R") Loading <- function(recipe) { # Source correct function depending on filesystem and time horizon diff --git a/modules/Loading/load_datasets.R b/modules/Loading/load_datasets.R deleted file mode 100644 index 86010780c1667b65406f14b57f7ff03ac1821809..0000000000000000000000000000000000000000 --- a/modules/Loading/load_datasets.R +++ /dev/null @@ -1,7 +0,0 @@ -load_datasets <- function(recipe) { - warning(paste0("The function load_datasets() has been renamed to: ", - "'Loading()'. The name 'load_datasets' will be ", - "deprecated in the next release. Please change your scripts ", - "accordingly.")) - return(Loading(recipe)) -} diff --git a/modules/Skill/Skill.R b/modules/Skill/Skill.R index 04fbc52efb5246e86c601007be1ced893439fc14..694fd3223e39190de4cb25d87539d5eebd0b46c9 100644 --- a/modules/Skill/Skill.R +++ b/modules/Skill/Skill.R @@ -15,9 +15,6 @@ source("modules/Saving/R/drop_dims.R") source("modules/Skill/R/RPS_clim.R") source("modules/Skill/R/CRPS_clim.R") source("modules/Skill/R/tmp/GetProbs.R") -## TODO: Remove in the next release -source("modules/Skill/compute_skill_metrics.R") -source("modules/Skill/compute_probabilities.R") Skill <- function(recipe, data, agg = 'global') { diff --git a/modules/Skill/compute_probabilities.R b/modules/Skill/compute_probabilities.R deleted file mode 100644 index 44a91b96e8573d4dac77cb1f02b59fa9a3c3b3cc..0000000000000000000000000000000000000000 --- a/modules/Skill/compute_probabilities.R +++ /dev/null @@ -1,7 +0,0 @@ -compute_probabilities <- function(recipe, data) { - warning(paste0("The function compute_probabilities() has been renamed to: ", - "'Probabilities()'. The name 'compute_probabilities' will be ", - "deprecated in the next release. Please change your scripts ", - "accordingly.")) - return(Probabilities(recipe, data)) -} diff --git a/modules/Skill/compute_skill_metrics.R b/modules/Skill/compute_skill_metrics.R deleted file mode 100644 index 98f0f2ebd2f0975fa483bc808e3f1a9df8ecfec4..0000000000000000000000000000000000000000 --- a/modules/Skill/compute_skill_metrics.R +++ /dev/null @@ -1,7 +0,0 @@ -compute_skill_metrics <- function(recipe, data) { - warning(paste0("The function compute_skill_metrics() has been renamed to: ", - "'Skill()'. The name 'compute_skill_metrics' will be ", - "deprecated in the next release. Please change your scripts ", - "accordingly.")) - return(Skill(recipe, data)) -} diff --git a/modules/Visualization/Visualization.R b/modules/Visualization/Visualization.R index ae94ed3d01526f8cf98932a2adf6f6bce6d7359d..1426a085e2e36aae411c30f161e564a1e4969684 100644 --- a/modules/Visualization/Visualization.R +++ b/modules/Visualization/Visualization.R @@ -10,8 +10,6 @@ source("modules/Visualization/R/get_proj_code.R") source("modules/Visualization/R/tmp/PlotRobinson.R") source("modules/Visualization/R/plot_most_likely_terciles_map.R") source("modules/Visualization/R/plot_ensemble_mean.R") -## TODO: Remove in the next release -source("modules/Visualization/plot_data.R") Visualization <- function(recipe, data, diff --git a/modules/Visualization/plot_data.R b/modules/Visualization/plot_data.R deleted file mode 100644 index 910b40fa16c6c912649101c9358fbe1a1973a932..0000000000000000000000000000000000000000 --- a/modules/Visualization/plot_data.R +++ /dev/null @@ -1,11 +0,0 @@ -plot_data <- function(recipe, - data, - skill_metrics = NULL, - probabilities = NULL, - significance = F) { - warning(paste0("The function plot_data() has been renamed to: ", - "'Visualization()'. The name 'plot_data()' will be ", - "deprecated in the next release. Please change your scripts ", - "accordingly.")) - return(Visualization(recipe, data, skill_metrics, probabilities, significance)) -}