Merge branch 'dev_julien'

rte-antares-rpackage · Jun 5, 2018 · 39a05d8 · 39a05d8
2 parents 3b80ec1 + 5404975
commit 39a05d8
Show file tree

Hide file tree

Showing 3 changed files with 503 additions and 0 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -7,6 +7,7 @@ export(read_candidates)
 export(read_options)
 export(report)
 export(run_simulation)
+export(select_years)
 import(data.table)
 importFrom(antaresEditObject,getPlaylist)
 importFrom(antaresEditObject,readIniFile)
@@ -21,8 +22,10 @@ importFrom(antaresRead,readOptimCriteria)
 importFrom(antaresRead,setSimulationPath)
 importFrom(antaresRead,simOptions)
 importFrom(assertthat,assert_that)
+importFrom(cluster,pam)
 importFrom(data.table,first)
 importFrom(data.table,last)
+importFrom(dplyr,arrange)
 importFrom(dplyr,filter)
 importFrom(dplyr,group_by)
 importFrom(dplyr,mutate)