Browse code

removed DataFrame in fmerge.R and ucscannot.R

y.tan authored on 07/06/2018 23:04:05
Showing 2 changed files

... ...
@@ -1,7 +1,7 @@
1 1
 fmerge <-
2 2
 function(fl1,fl2,ID1,ID2,A="",B="",method="No"){
3
-fl1<-DataFrame(fl1)
4
-fl2<-DataFrame(fl2)
3
+fl1<-as.data.frame(fl1)
4
+fl2<-as.data.frame(fl2)
5 5
 try (if(is.null(dim(fl1))|is.null(dim(fl2))) 
6 6
    stop("No data to be merged")
7 7
    )
... ...
@@ -36,6 +36,6 @@ merge.dat<-cbind(as.data.frame(fl1.new),as.data.frame(fl2.new))
36 36
 mergdata<-merge.dat[,-"SNPID2"]
37 37
 }
38 38
 mergdata<-merge.dat[,-1]
39
-mergdata<-DataFrame(mergdata)
39
+mergdata<-as.data.frame(mergdata)
40 40
 return(mergdata)
41 41
 }
... ...
@@ -1,6 +1,6 @@
1 1
 ucscannot <-
2 2
 function(UCSCannot,SNPn,A=3,B=1.9,C=1.3, method=1){
3
-UCSCannot<-DataFrame(UCSCannot)	
3
+UCSCannot<-as.data.frame(UCSCannot)	
4 4
 function_unit<-UCSCannot$function_unit
5 5
 if(is.null(function_unit)){
6 6
 stop("No function_unit found in the data")