Browse code

v 2.13.1: works with STRICT_R_HEADERS

ramon diaz-uriarte (at Phelsuma) authored on 07/02/2019 18:45:19
Showing7 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.13.0
5
-Date: 2018-07-16
4
+Version: 2.13.1
5
+Date: 2019-02-07
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"))
... ...
@@ -428,8 +428,11 @@ oncoSimulPop <- function(Nindiv,
428 428
                         detectionProb = detectionProb,
429 429
                         AND_DrvProbExit = AND_DrvProbExit,
430 430
                         fixation = fixation),
431
-                    mc.cores = mc.cores
432
-                    )
431
+                    mc.cores = mc.cores)
432
+    ## mc.allow.recursive = FALSE ## FIXME: remove?
433
+                    ## done for covr issue
434
+                    ## https://github.com/r-lib/covr/issues/335#issuecomment-424116766
435
+                    
433 436
     class(pop) <- "oncosimulpop"
434 437
     attributes(pop)$call <- match.call()
435 438
     return(pop)
... ...
@@ -1,3 +1,9 @@
1
+Changes in version 2.13.1 (2019-02-07):
2
+	- bumped to one over the BioC-3.9 version
3
+
4
+Changes in version 2.11.2 (2018-09-24):
5
+	- works with STRICT_R_HEADERS
6
+	
1 7
 Changes in version 2.11.1:
2 8
 	- robustify test.fixation.R, Local max, tolerance
3 9
 	
... ...
@@ -22,8 +22,9 @@
22 22
 #include "common_classes.h"
23 23
 #include "bnb_common.h"
24 24
 #include "new_restrict.h"
25
-#include <Rcpp.h>
25
+#include <cfloat>
26 26
 #include <limits>
27
+#include <Rcpp.h>
27 28
 #include <iostream>
28 29
 #include <random>
29 30
 #include <set>
... ...
@@ -17,7 +17,7 @@
17 17
 #include "debug_common.h"
18 18
 #include "common_classes.h"
19 19
 #include "bnb_common.h"
20
-
20
+#include <cfloat> 
21 21
 #include <limits>
22 22
 #include <iostream>
23 23
 #include <random>
... ...
@@ -14,7 +14,7 @@
14 14
 //     along with this program.  If not, see <http://www.gnu.org/licenses/>.
15 15
 
16 16
 
17
-
17
+#include <cfloat> 
18 18
 #include "bnb_common.h"
19 19
 #include "new_restrict.h" // for the TypeModel enum
20 20
 #include <Rcpp.h>
... ...
@@ -1,15 +1,15 @@
1 1
 \usepackage[%
2
-		shash={c58241c},
3
-		lhash={c58241c578e1e58ea975ab0283f4f9a9898be60a},
4
-		authname={ramon diaz-uriarte (at Phelsuma)},
2
+		shash={fd5f72e},
3
+		lhash={fd5f72ece0484508a63cf408dbe6ab2cdb5cb5b2},
4
+		authname={Ramon Diaz-Uriarte (at Coleonyx)},
5 5
 		authemail={rdiaz02@gmail.com},
6
-		authsdate={2018-04-18},
7
-		authidate={2018-04-18 02:15:18 +0200},
8
-		authudate={1524010518},
9
-		commname={ramon diaz-uriarte (at Phelsuma)},
6
+		authsdate={2018-05-04},
7
+		authidate={2018-05-04 18:44:29 +0200},
8
+		authudate={1525452269},
9
+		commname={Ramon Diaz-Uriarte (at Coleonyx)},
10 10
 		commemail={rdiaz02@gmail.com},
11
-		commsdate={2018-04-18},
12
-		commidate={2018-04-18 02:15:18 +0200},
13
-		commudate={1524010518},
11
+		commsdate={2018-05-04},
12
+		commidate={2018-05-04 18:44:29 +0200},
13
+		commudate={1525452269},
14 14
 		refnames={ (HEAD -> master, origin/master, origin/HEAD)}
15 15
 	]{gitsetinfo}
16 16
\ No newline at end of file