Version 2022-2023

Author: phgrosjean

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: BioDataScience3
-Version: 2021.0.1
+Version: 2022.0.0
 Title: A Series of Learnr Documents for Biological Data Science 3
 Description: Interactive documents using learnr for studying biological data science (second course).
 Authors@R: c(
@@ -8,14 +8,14 @@ Authors@R: c(
   person("Guyliann", "Engels", role = "aut",
   email = "[email protected]"))
 Maintainer: Philippe Grosjean <[email protected]>
-Depends: R (>= 3.5.0)
+Depends: R (>= 4.1.0)
 Imports: learnitdown, BioDataScience, shiny, miniUI
-Suggests: SciViews, ggplot2, ggpubr, data.io, flow, chart, covr, knitr, testthat, gradethis
+Suggests: SciViews, ggplot2, ggpubr, data.io, svMisc, svBase, svFlow, chart, covr, knitr, testthat, gradethis
 License: MIT + file LICENSE
 Encoding: UTF-8
 LazyData: true
 URL: https://github.com/BioDataScience-Course/BioDataScience3
 BugReports: https://github.com/BioDataScience-Course/BioDataScience3/issues
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.1.1
+RoxygenNote: 7.1.2
 VignetteBuilder: knitr

NEWS.md

@@ -1,8 +1,12 @@
 # BioDataScience3 News
 
+## Change in version 2022.0.1
+
+-   New version for academic year 2022-2023.
+
 ## Change in version 2021.0.1
 
--   Updated wine challenge (C03Sa_challenge -> C03Ca_ml_wine).
+-   Updated wine challenge (C03Sa_challenge -\> C03Ca_ml_wine).
 
 ## Change in version 2021.0.0
 

inst/shiny/C03Ca_ml_wine/app.R

@@ -170,14 +170,22 @@ server <- function(input, output) {
     if (!is.null(file$datapath) && grepl("^.+__.+\\.rds", file$name) &&
       !is_done()) {
       solution <- data.io::read$rds(file$datapath)$value
+      message("data read")
       score <- score_model(solution)
+      message("score is ", score)
       name <- file$name
+      message("name is ", name)
       project <- sub("(^.+)__.+$", "\\1", name)
       model <- sub(("^.+__(.+)\\.rds$"), "\\1", name)
+      if (project == name) {
+        message("Wrong name!")
+        score <- NA
+      }
     } else {
       score <- NA
     }
     ranking <- load_data()
+    message("Data loaded")
     # Record an entry in the mongoDB database
     # But we need the login of *all* members of the team, and we don't have them
     # right now => leave this to a post-process task instead!
@@ -198,6 +206,7 @@ server <- function(input, output) {
       ranking$date <- as.POSIXct(ranking$date, origin = "1960-01-01")
       ranking$date <- format(ranking$date, "%Y-%m-%d %H:%M:%S")
     }
+    message("Date reworked")
     # Add a column with medals for the three first results
     n <- NROW(ranking)
     if (n == 0) {
@@ -207,10 +216,11 @@ server <- function(input, output) {
       if (n < 4) {
         medals <- medals[1:n]
       } else {
-        medals <- c(medals, rep("", 1:(n - 3)))
+        medals <- c(medals, rep("", n - 3))
       }
     }
     ranking <- data.frame(rank = medals, ranking)
+    message("Ranking done")
     names(ranking) <- c("", "Projet", "Mod\u00e8le", "Date", "Score")
     ranking
   })