Browse code

2.17.9: POM doc and adapt to stringsAsFactors = FALSE

ramon diaz-uriarte (at Phelsuma) authored on 17/03/2020 12:31:37
Showing5 changed files

... ...
@@ -1,8 +1,8 @@
1 1
 Package: OncoSimulR
2 2
 Type: Package
3 3
 Title: Forward Genetic Simulation of Cancer Progression with Epistasis 
4
-Version: 2.17.8
5
-Date: 2020-02-02
4
+Version: 2.17.9
5
+Date: 2020-03-16
6 6
 Authors@R: c(person("Ramon", "Diaz-Uriarte", role = c("aut", "cre"),
7 7
 		     email = "rdiaz02@gmail.com"),
8 8
 	      person("Mark", "Taylor", role = "ctb", email = "ningkiling@gmail.com"),
... ...
@@ -1,3 +1,8 @@
1
+Changes in version 2.17.9 (2020-03-16):
2
+	- With R-devel, stringsAsFactors = FALSE by default. Fix
3
+	tests
4
+	- POM documentation.
5
+	
1 6
 Changes in version 2.17.8 (2020-02-02):
2 7
 	- With newest R-devel (01-28) getting
3 8
 	  "the condition has length > 1": fixed.
... ...
@@ -46,7 +46,7 @@ diversityLOD(llod)
46 46
 \item{llod}{A list of LODs, as returned from \code{LOD} on an object of
47 47
   class \code{oncosimulpop}.}
48 48
 
49
-\item{...}{Other arguments passed to methods (ignored now).}
49
+% \item{...}{Other arguments passed to methods (ignored now).}
50 50
 }
51 51
 
52 52
 \details{
... ...
@@ -8,22 +8,23 @@ test_that("Issue warnings and messages", {
8 8
                       stringsAsFactors = FALSE)
9 9
     expect_warning(OncoSimulR:::allGenotypes_to_matrix(df1),
10 10
                    "No WT genotype. Setting its fitness to 1.", fixed = TRUE)
11
-    
11
+    if(as.character(version$major) < 4) {
12 12
     df2 <- data.frame(Genotype = c("WT", "A", "B, C"), Fitness = c(5, 1.3, 2))
13 13
     expect_warning(OncoSimulR:::allGenotypes_to_matrix(df2),
14 14
                    "First column of genotype fitness is a factor.",
15 15
                    fixed = TRUE)
16
-
16
+    }
17 17
     df1 <- data.frame(Genotype = c("A", "B, C"), Fitness = c(1.3, 2),
18 18
                       stringsAsFactors = FALSE)
19 19
     expect_warning(OncoSimulR:::to_genotFitness_std(df1),
20 20
                    "No WT genotype. Setting its fitness to 1.", fixed = TRUE)
21 21
     
22
-    
22
+    if(as.character(version$major) < 4) {    
23 23
     df2 <- data.frame(Genotype = c("WT", "A", "B, C"), Fitness = c(5, 1.3, 2))
24 24
     expect_warning(OncoSimulR:::to_genotFitness_std(df2),
25 25
                    "First column of genotype fitness is a factor.",
26 26
                    fixed = TRUE)
27
+    }
27 28
 })
28 29
 
29 30
 test_that("Equality of fitness including allFitnessEffects", {
... ...
@@ -1,15 +1,15 @@
1 1
 \usepackage[%
2
-		shash={307dc97},
3
-		lhash={307dc975828df7c1e4e883c4b428d33755045976},
2
+		shash={6645512},
3
+		lhash={6645512b7cd187b01b88180c74ed7299895ad4ca},
4 4
 		authname={ramon diaz-uriarte (at Phelsuma)},
5 5
 		authemail={rdiaz02@gmail.com},
6
-		authsdate={2020-01-30},
7
-		authidate={2020-01-30 19:18:32 +0100},
8
-		authudate={1580408312},
6
+		authsdate={2020-02-02},
7
+		authidate={2020-02-02 00:47:42 +0100},
8
+		authudate={1580600862},
9 9
 		commname={ramon diaz-uriarte (at Phelsuma)},
10 10
 		commemail={rdiaz02@gmail.com},
11
-		commsdate={2020-01-30},
12
-		commidate={2020-01-30 19:18:32 +0100},
13
-		commudate={1580408312},
11
+		commsdate={2020-02-02},
12
+		commidate={2020-02-02 00:47:42 +0100},
13
+		commudate={1580600862},
14 14
 		refnames={ (HEAD -> master, origin/master, origin/HEAD)}
15 15
 	]{gitsetinfo}
16 16
\ No newline at end of file