Skip to content

Commit

Permalink
update noRd and exports
Browse files Browse the repository at this point in the history
  • Loading branch information
baptsegu committed Feb 9, 2018
1 parent 4698db8 commit 14907cb
Show file tree
Hide file tree
Showing 26 changed files with 15 additions and 418 deletions.
6 changes: 0 additions & 6 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
# Generated by roxygen2: do not edit by hand

export(benders)
export(clean_output_benders)
export(delete_antares_output)
export(enable_hurdle_costs)
export(filter_output_areas)
export(filter_output_links)
export(get_whole_simulation_name)
export(read_candidates)
export(read_options)
export(report)
export(run_simulation)
export(set_simulation_period)
export(update_link)
import(data.table)
importFrom(antaresEditObject,getPlaylist)
importFrom(antaresEditObject,setPlaylist)
Expand Down
1 change: 1 addition & 0 deletions R/benders_tools.R
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#' @importFrom assertthat assert_that
#' @importFrom antaresRead simOptions getLinks getAreas
#' @importFrom antaresEditObject updateGeneralSettings updateOptimizationSettings
#' @noRd
#'
set_antares_options <- function(benders_options, candidates, opts = antaresRead::simOptions())
{
Expand Down
2 changes: 1 addition & 1 deletion R/check.R
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#'
#' @importFrom antaresRead simOptions readClusterDesc
#' @importFrom dplyr filter
#'
#' @noRd
#'
benders_check <- function(candidates, opts = antaresRead::simOptions())
{
Expand Down
2 changes: 1 addition & 1 deletion R/clean.R
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ delete_antares_output <- function(simulation_name, opts = antaresRead::simOption
#'
#' @importFrom antaresRead simOptions
#' @importFrom assertthat assert_that
#' @export
#' @noRd
#'
clean_output_benders <- function(best_solution, unique_key, opts = antaresRead::simOptions())
{
Expand Down
8 changes: 4 additions & 4 deletions R/link.r
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#' Name of one link
#' @return
#' name of the first area that the link connects
#'
#' @noRd
#'
from <- function(link_name)
{
Expand All @@ -21,7 +21,7 @@ from <- function(link_name)
#' Name of one link
#' @return
#' name of the second area that the link connects
#'
#' @noRd
#'
to <- function(link_name)
{
Expand All @@ -48,7 +48,7 @@ to <- function(link_name)
#'
#' @importFrom assertthat assert_that
#' @importFrom antaresRead simOptions
#' @export
#' @noRd
#'
#'

Expand Down Expand Up @@ -137,7 +137,7 @@ enable_hurdle_costs <- function(link_names, enable = TRUE, opts = antaresRead::s
#' @importFrom assertthat assert_that
#' @importFrom antaresRead simOptions
#' @importFrom utils write.table
#' @export
#' @noRd
#'
#'
update_link <- function(link_name, property_name, new_value, opts = antaresRead::simOptions())
Expand Down
2 changes: 2 additions & 0 deletions R/master.R
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#' @importFrom antaresRead simOptions
#' @importFrom assertthat assert_that
#' @importFrom antaresEditObject getPlaylist
#' @noRd
#'
initiate_master <- function(candidates, exp_options , opts = antaresRead::simOptions())
{
Expand Down Expand Up @@ -126,6 +127,7 @@ initiate_master <- function(candidates, exp_options , opts = antaresRead::simOpt
#'
#' @importFrom antaresRead simOptions
#' @importFrom assertthat assert_that
#' @noRd
#'
solve_master <- function(opts = antaresRead::simOptions(), relax_integrality = FALSE, ampl_path = NULL)
{
Expand Down
32 changes: 0 additions & 32 deletions R/patch_numeric_accuracy.R

This file was deleted.

4 changes: 2 additions & 2 deletions R/read_candidates.R
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ read_candidates <- function(file, opts = antaresRead::simOptions())
#'
#' @return
#' Returns a vector of link name
#'
#' @noRd
#'
with_profile <- function(candidates)
{
Expand All @@ -218,7 +218,7 @@ with_profile <- function(candidates)
#'
#' @return
#' Returns a vector of link name
#'
#' @noRd
#'
without_profile <- function(candidates)
{
Expand Down
1 change: 1 addition & 0 deletions R/report.R
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ report <- function(benders_out = "last", file = default_report_file(opts), opts
#'
#' @importFrom antaresRead simOptions
#' @importFrom lubridate now
#' @noRd
#'
default_report_file <- function(opts = antaresRead::simOptions())
{
Expand Down
6 changes: 3 additions & 3 deletions R/simulation_settings.R
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#'
#' @importFrom assertthat assert_that
#' @importFrom antaresRead simOptions
#' @export
#' @noRd
#'
#'
filter_output_areas <- function(areas, filter, type, opts = antaresRead::simOptions())
Expand Down Expand Up @@ -91,7 +91,7 @@ filter_output_areas <- function(areas, filter, type, opts = antaresRead::simOpti
#'
#' @importFrom assertthat assert_that
#' @importFrom antaresRead simOptions
#' @export
#' @noRd
#'
#'
filter_output_links <- function(links, filter, type, opts = antaresRead::simOptions())
Expand Down Expand Up @@ -158,7 +158,7 @@ filter_output_links <- function(links, filter, type, opts = antaresRead::simOpti
#' @importFrom antaresRead simOptions
#' @importFrom data.table first last
#' @importFrom antaresEditObject updateGeneralSettings
#' @export
#' @noRd
#'
set_simulation_period <- function(weeks, opts = antaresRead::simOptions())
{
Expand Down
21 changes: 0 additions & 21 deletions man/benders_check.Rd

This file was deleted.

24 changes: 0 additions & 24 deletions man/clean_output_benders.Rd

This file was deleted.

18 changes: 0 additions & 18 deletions man/default_report_file.Rd

This file was deleted.

25 changes: 0 additions & 25 deletions man/enable_hurdle_costs.Rd

This file was deleted.

29 changes: 0 additions & 29 deletions man/filter_output_areas.Rd

This file was deleted.

29 changes: 0 additions & 29 deletions man/filter_output_links.Rd

This file was deleted.

17 changes: 0 additions & 17 deletions man/from.Rd

This file was deleted.

26 changes: 0 additions & 26 deletions man/initiate_master.Rd

This file was deleted.

Loading

0 comments on commit 14907cb

Please sign in to comment.