Browse code

2.19.1

ramon diaz-uriarte (at Phelsuma) authored on 06/05/2020 10:10:54
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.19.0
5
-Date: 2020-04-27
4
+Version: 2.19.1
5
+Date: 2020-05-05
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,10 @@
1
+Changes in version 2.19.1 (2020-05-05):
2
+	- Occasional failures of @test.sample-prob.R#42
3
+	in Windows 386
4
+
5
+Changes in version 2.19.0 (2020-05-05):
6
+	- Bumped version to match current Biocdevel.
7
+
1 8
 Changes in version 2.17.92 (2020-04-27):
2 9
 	- Fixed test.Z-magellan failure in Mac.
3 10
 
... ...
@@ -903,6 +903,7 @@ void addToPOM(POM& pom,
903 903
     pom.genotypesString.push_back(g);
904 904
     pom.genotypes.push_back(genotype);
905 905
   } else if ( !(pom.genotypes.back() == genotype) ) {
906
+    // Insert only if different from previous
906 907
     std::string g = genotypeToNameString(genotypeSingleVector(genotype),
907 908
 				       fg, intName);
908 909
     pom.genotypesString.push_back(g);
... ...
@@ -9,8 +9,8 @@ test_that("Increasing cPDetect decreases time, Exp" , {
9 9
     gi <- rep(0.1, 10)
10 10
     names(gi) <- letters[1:10]
11 11
     oi <- allFitnessEffects(noIntGenes = gi)
12
-    n <- 200
13
-    max.tries <- 4  
12
+    n <- 400 ## I once saw a failure in BioC, Windows 
13
+    max.tries <- 4 
14 14
     for(tries in 1:max.tries) {
15 15
         sa <- oncoSimulPop(n,
16 16
                            oi,
... ...
@@ -1,15 +1,15 @@
1 1
 \usepackage[%
2
-		shash={0570766},
3
-		lhash={05707665ce30a06352e30dbc4604dc903c194170},
4
-		authname={ramon diaz-uriarte, phelsuma, win vbox},
2
+		shash={e770649},
3
+		lhash={e770649caae859dcb7db64eefbc62abeb3757406},
4
+		authname={ramon diaz-uriarte (at Phelsuma)},
5 5
 		authemail={rdiaz02@gmail.com},
6
-		authsdate={2020-04-24},
7
-		authidate={2020-04-24 03:05:59 +0100},
8
-		authudate={1587693959},
9
-		commname={ramon diaz-uriarte, phelsuma, win vbox},
6
+		authsdate={2020-05-05},
7
+		authidate={2020-05-05 10:30:56 +0200},
8
+		authudate={1588667456},
9
+		commname={ramon diaz-uriarte (at Phelsuma)},
10 10
 		commemail={rdiaz02@gmail.com},
11
-		commsdate={2020-04-24},
12
-		commidate={2020-04-24 03:05:59 +0100},
13
-		commudate={1587693959},
11
+		commsdate={2020-05-05},
12
+		commidate={2020-05-05 10:30:56 +0200},
13
+		commudate={1588667456},
14 14
 		refnames={ (HEAD -> master, origin/master, origin/HEAD)}
15 15
 	]{gitsetinfo}
16 16
\ No newline at end of file