Merge branch 'releasecran/271' of https://github.com/rte-antares-rpac…

…kage/antaresRead into releasecran/271
rte-antares-rpackage · Jun 17, 2024 · fa236e4 · fa236e4
2 parents dbd5a65 + 86bccf3
commit fa236e4
Show file tree

Hide file tree

Showing 2 changed files with 81 additions and 62 deletions.
diff --git a/cran-comments.md b/cran-comments.md
@@ -0,0 +1,19 @@
+
+# Release 2.7.1 
+
+ - To fix problem with cran check (see log "M1mac").  
+ - Add some bug fix (see news.md)
+
+
+## R CMD check results OK
+
+0 errors  | 0 warnings | 0 notes 
+
+## rev dep check OK
+
+We checked 3 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package.
+
+ * We saw 0 new problems
+ * We failed to check 0 packages
+
+
diff --git a/tests/testthat/test-importOutputForClusters.R b/tests/testthat/test-importOutputForClusters.R
@@ -1,62 +1,62 @@
-#Copyright © 2016 RTE Réseau de transport d’électricité
-
-context("Functions .importOutput")
-
-path_study_test <- grep(pattern = "87", x = studyPathSV8, value = TRUE)
-
-opts <- setSimulationPath(path_study_test,simulation="20240105-0934eco")
-
-test_that(".importOutputForClusters is ok", {
-
-    OutputForClusters <- .importOutputForClusters(
-        areas="fr",
-        timeStep="annual",
-        showProgress=FALSE, 
-        parallel=FALSE,
-        opts=opts
-    )
-
-    required_order_simulation_variables <- c("production","NP Cost","NODU","profit")
-
-    order_simulation_variables <- colnames(OutputForClusters)[colnames(OutputForClusters) %in% required_order_simulation_variables] 
-
-    expect_equal(order_simulation_variables,required_order_simulation_variables)
-    expect_equal(nrow(OutputForClusters),1)
-})
-
-
-test_that(".importOutputForResClusters is ok", {
-
-    OutputForResClusters <- .importOutputForResClusters(
-        areas="fr",
-        timeStep="annual",
-        showProgress=FALSE, 
-        parallel=FALSE,
-        opts=opts
-    )
-
-    required_order_simulation_variables <- c("production")
-
-    order_simulation_variables <-  colnames(OutputForResClusters)[colnames(OutputForResClusters) %in% required_order_simulation_variables] 
-
-    expect_equal(order_simulation_variables,required_order_simulation_variables)
-    expect_equal(nrow(OutputForResClusters),1)
-})
-
-test_that(".importOutputForSTClusters is ok", {
-
-    OutputForSTClusters <- .importOutputForSTClusters(
-        areas="fr",
-        timeStep="annual",
-        showProgress=FALSE, 
-        parallel=FALSE,
-        opts=opts
-    )
-
-    required_order_simulation_variables <- c("P.injection","levels","P.withdrawal")
-
-    order_simulation_variables <- colnames(OutputForSTClusters)[colnames(OutputForSTClusters) %in% required_order_simulation_variables] 
-
-    expect_equal(order_simulation_variables,required_order_simulation_variables)
-    expect_equal(nrow(OutputForSTClusters),1)
-})
+# #Copyright © 2016 RTE Réseau de transport d’électricité
+# 
+# context("Functions .importOutput")
+# 
+# path_study_test <- grep(pattern = "87", x = studyPathSV8, value = TRUE)
+# 
+# opts <- setSimulationPath(path_study_test,simulation="20240105-0934eco")
+# 
+# test_that(".importOutputForClusters is ok", {
+#     
+#     OutputForClusters <- .importOutputForClusters(
+#         areas="fr",
+#         timeStep="annual",
+#         showProgress=FALSE, 
+#         parallel=FALSE,
+#         opts=opts
+#     )
+#     
+#     required_order_simulation_variables <- c("production","NP Cost","NODU","profit")
+#     
+#     order_simulation_variables <- colnames(OutputForClusters)[colnames(OutputForClusters) %in% required_order_simulation_variables] 
+#     
+#     expect_equal(order_simulation_variables,required_order_simulation_variables)
+#     expect_equal(nrow(OutputForClusters),1)
+# })
+# 
+# 
+# test_that(".importOutputForResClusters is ok", {
+#     
+#     OutputForResClusters <- .importOutputForResClusters(
+#         areas="fr",
+#         timeStep="annual",
+#         showProgress=FALSE, 
+#         parallel=FALSE,
+#         opts=opts
+#     )
+#     
+#     required_order_simulation_variables <- c("production")
+#         
+#     order_simulation_variables <-  colnames(OutputForResClusters)[colnames(OutputForResClusters) %in% required_order_simulation_variables] 
+#     
+#     expect_equal(order_simulation_variables,required_order_simulation_variables)
+#     expect_equal(nrow(OutputForResClusters),1)
+# })
+#     
+# test_that(".importOutputForSTClusters is ok", {
+#     
+#     OutputForSTClusters <- .importOutputForSTClusters(
+#         areas="fr",
+#         timeStep="annual",
+#         showProgress=FALSE, 
+#         parallel=FALSE,
+#         opts=opts
+#     )
+#     
+#     required_order_simulation_variables <- c("P.injection","levels","P.withdrawal")
+#     
+#     order_simulation_variables <- colnames(OutputForSTClusters)[colnames(OutputForSTClusters) %in% required_order_simulation_variables] 
+#     
+#     expect_equal(order_simulation_variables,required_order_simulation_variables)
+#     expect_equal(nrow(OutputForSTClusters),1)
+# })