Browse code

2.3.10: windows issues with mc.cores

git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/OncoSimulR@119370 bc3139a8-67e5-0310-9ffc-ced21a209358

Ramon Diaz-Uriarte authored on 14/07/2016 18:22:20
Showing 4 changed files

... ...
@@ -1,8 +1,8 @@
1 1
 Package: OncoSimulR
2 2
 Type: Package
3 3
 Title: Forward Genetic Simulation of Cancer Progresion with Epistasis 
4
-Version: 2.3.9
5
-Date: 2016-07-09
4
+Version: 2.3.10
5
+Date: 2016-07-14
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,4 +1,7 @@
1
-Changes in version 2.3.9 (2017-07-0):
1
+Changes in version 2.3.9 (2017-07-14):
2
+	- The windows check failure with mc.cores.
3
+	
4
+Changes in version 2.3.9 (2017-07-09):
2 5
 	- Accessible genotypes in rfitness and plotFitnessLandscape
3 6
 
4 7
 Changes in version 2.3.8 (2017-07-08):
... ...
@@ -4339,7 +4339,7 @@ if(.Platform$OS.type == "windows") {
4339 4339
 p2 <- mclapply(1:4, function(x) oncoSimulIndiv(pancr,
4340 4340
                                                detectionSize = 1e7,
4341 4341
                                                keepEvery = 10),
4342
-                                               mc.cores = 2)
4342
+                                               mc.cores = mc.cores)
4343 4343
 class(p2) <- "oncosimulpop"
4344 4344
 samplePop(p2)
4345 4345
 @ 
... ...
@@ -1,15 +1,15 @@
1 1
 \usepackage[%
2
-		shash={23758f4},
3
-		lhash={23758f41c637253bd524665045d19c5b159d884c},
4
-		authname={Ramon Diaz-Uriarte (at Lacerta)},
5
-		authemail={rdiaz02@gmail.com},
6
-		authsdate={2016-07-07},
7
-		authidate={2016-07-07 01:50:25 +0200},
8
-		authudate={1467849025},
9
-		commname={Ramon Diaz-Uriarte (at Lacerta)},
10
-		commemail={rdiaz02@gmail.com},
11
-		commsdate={2016-07-07},
12
-		commidate={2016-07-07 01:50:25 +0200},
13
-		commudate={1467849025},
14
-		refnames={ (HEAD, origin/master, origin/HEAD)}
2
+		shash={66cf4f1},
3
+		lhash={66cf4f192d83ab3aa9ff159405ab08c1ffd05be3},
4
+		authname={Ramon Diaz-Uriarte},
5
+		authemail={rdiaz02@users.noreply.github.com},
6
+		authsdate={2016-07-11},
7
+		authidate={2016-07-11 08:27:58 +0200},
8
+		authudate={1468218478},
9
+		commname={Ramon Diaz-Uriarte},
10
+		commemail={rdiaz02@users.noreply.github.com},
11
+		commsdate={2016-07-11},
12
+		commidate={2016-07-11 08:27:58 +0200},
13
+		commudate={1468218478},
14
+		refnames={ (HEAD -> master, origin/master, origin/HEAD)}
15 15
 	]{gitsetinfo}
16 16
\ No newline at end of file