Browse code

2.17.8

ramon diaz-uriarte (at Phelsuma) authored on 01/02/2020 23:58:49
Showing4 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.7
5
-Date: 2020-01-30
4
+Version: 2.17.8
5
+Date: 2020-02-02
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"),
... ...
@@ -12,8 +12,8 @@
12 12
 ## License: GPL (>= 2)
13 13
 
14 14
 nem_transitive.reduction <- function(g){
15
-	if (!(class(g)%in%c("matrix","graphNEL"))) stop("Input must be an adjacency matrix or graphNEL object")
16
-	if(class(g) == "graphNEL"){
15
+	if (!any(class(g)%in%c("matrix","graphNEL"))) stop("Input must be an adjacency matrix or graphNEL object")
16
+	if(any(class(g) == "graphNEL")){
17 17
 		g = as(g, "matrix")		
18 18
 	}
19 19
 # 	if("Rglpk" %in% loadedNamespaces()){ # constraints müssen einzeln hinzugefügt und jedesmal das ILP gelöst werden. Danach müssen jedesmal die constraints überprüft werden und nicht mehr gebrauchte rausgeschmissen werden
... ...
@@ -104,7 +104,7 @@ nem_transitive.reduction <- function(g){
104 104
 
105 105
 nem_transitive.closure <- function(g,mat=FALSE,loops=TRUE){
106 106
 
107
-    if (!(class(g)%in%c("graphNEL","matrix"))) stop("Input must be either graphNEL object or adjacency matrix")
107
+    if (!any(class(g)%in%c("graphNEL","matrix"))) stop("Input must be either graphNEL object or adjacency matrix")
108 108
     g <- as(g, "matrix")
109 109
     
110 110
     #-- adjacency matrix
... ...
@@ -1,3 +1,7 @@
1
+Changes in version 2.17.8 (2020-02-02):
2
+	- With newest R-devel (01-28) getting
3
+	  "the condition has length > 1": fixed.
4
+	
1 5
 Changes in version 2.17.7 (2020-01-30):
2 6
 	- Removed dependency on nem, to be deprecated. Adding nem's
3 7
 	code (file nem_transitive_reduction.R).
... ...
@@ -1,15 +1,15 @@
1 1
 \usepackage[%
2
-		shash={5f42713},
3
-		lhash={5f42713ca15e08bcae15e39a2c9e5c9f239b2e99},
2
+		shash={307dc97},
3
+		lhash={307dc975828df7c1e4e883c4b428d33755045976},
4 4
 		authname={ramon diaz-uriarte (at Phelsuma)},
5 5
 		authemail={rdiaz02@gmail.com},
6 6
 		authsdate={2020-01-30},
7
-		authidate={2020-01-30 14:08:28 +0100},
8
-		authudate={1580389708},
7
+		authidate={2020-01-30 19:18:32 +0100},
8
+		authudate={1580408312},
9 9
 		commname={ramon diaz-uriarte (at Phelsuma)},
10 10
 		commemail={rdiaz02@gmail.com},
11 11
 		commsdate={2020-01-30},
12
-		commidate={2020-01-30 14:08:28 +0100},
13
-		commudate={1580389708},
12
+		commidate={2020-01-30 19:18:32 +0100},
13
+		commudate={1580408312},
14 14
 		refnames={ (HEAD -> master, origin/master, origin/HEAD)}
15 15
 	]{gitsetinfo}
16 16
\ No newline at end of file