Browse code

re-modified fmerge.R,ucscannot.R,GMRP.Rnw and DESCRIPTION version 1.8.1

y.tan authored on 23/05/2018 22:58:27
Showing 5 changed files

... ...
@@ -1,8 +1,8 @@
1 1
 Package: GMRP
2 2
 Type: Package
3 3
 Title: GWAS-based Mendelian Randomization and Path Analyses
4
-Version: 1.8.0
5
-Date: 2018-05-19
4
+Version: 1.8.1
5
+Date: 2018-05-23
6 6
 Author: Yuan-De Tan
7 7
 Maintainer: Yuan-De Tan <tanyuande@gmail.com>
8 8
 Description: Perform Mendelian randomization analysis of multiple SNPs
... ...
@@ -1,6 +1,7 @@
1 1
 fmerge <-
2 2
 function(fl1,fl2,ID1,ID2,A="",B="",method="No"){
3
-
3
+fl1<-DataFrame(fl1)
4
+fl2<-DataFrame(fl2)
4 5
 try (if(is.null(dim(fl1))|is.null(dim(fl2))) 
5 6
    stop("No data to be merged")
6 7
    )
... ...
@@ -35,5 +36,6 @@ merge.dat<-cbind(as.data.frame(fl1.new),as.data.frame(fl2.new))
35 36
 mergdata<-merge.dat[,-"SNPID2"]
36 37
 }
37 38
 mergdata<-merge.dat[,-1]
39
+mergdata<-DataFrame(mergdata)
38 40
 return(mergdata)
39 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<-as.data.frame(UCSCannot)	
3
+UCSCannot<-DataFrame(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")
... ...
@@ -48,7 +48,7 @@ data12 <- fmerge(fl1=data1, fl2=data2, ID1="SNP", ID2="SNP", A=".dat1", B=".dat2
48 48
 ###################################################
49 49
 
50 50
 data(cad.data)
51
-#cad <- DataFrame(cad.data)
51
+cad <- DataFrame(cad.data)
52 52
 cad<-cad.data
53 53
 head(cad)
54 54
 
... ...
@@ -57,7 +57,7 @@ head(cad)
57 57
 ###################################################
58 58
 
59 59
 data(lpd.data)
60
-#lpd <- DataFrame(lpd.data)
60
+lpd <- DataFrame(lpd.data)
61 61
 lpd<-lpd.data
62 62
 head(lpd)
63 63
 
... ...
@@ -89,14 +89,14 @@ User can take the following approach to merge all four lipid files into a data s
89 89
   
90 90
 <<>>=
91 91
 data(cad.data)
92
-#cad <- DataFrame(cad.data)
92
+cad <- DataFrame(cad.data)
93 93
 cad<-cad.data
94 94
 head(cad)
95 95
 @
96 96
 
97 97
 <<>>=
98 98
 data(lpd.data)
99
-#lpd <- DataFrame(lpd.data)
99
+lpd <- DataFrame(lpd.data)
100 100
 lpd<-lpd.data
101 101
 head(lpd)
102 102
 @