Browse code

fix conflict in description

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

Rob Scharp authored on 30/09/2013 14:07:17
Showing 1 changed files
1 1
old mode 100644
2 2
new mode 100755
... ...
@@ -12,3 +12,15 @@ SEXP gtypeCallerPart2(SEXP *, SEXP *, SEXP *, SEXP *,
12 12
                       SEXP *, SEXP *, SEXP *);
13 13
 
14 14
 SEXP normalizeBAF(SEXP *, SEXP *);
15
+
16
+SEXP krlmmComputeM(SEXP *, SEXP *);
17
+
18
+SEXP krlmmComputeS(SEXP *, SEXP *);
19
+
20
+SEXP readGenCallOutputCFunc(SEXP *, SEXP *, SEXP *, SEXP *, SEXP *, SEXP *, SEXP *, SEXP *);
21
+
22
+SEXP krlmmConfidenceScore(SEXP *, SEXP *);
23
+
24
+SEXP krlmmHardyweinberg(SEXP *);
25
+
26
+SEXP countFileLines(SEXP *);
Browse code

bugfix: normalizeBAF not registered

Fixed registering of normalizeBAF; the wrapper for it, in R, is
getBAF().

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

Rob Scharp authored on 04/10/2011 16:11:36
Showing 1 changed files
... ...
@@ -12,4 +12,3 @@ SEXP gtypeCallerPart2(SEXP *, SEXP *, SEXP *, SEXP *,
12 12
                       SEXP *, SEXP *, SEXP *);
13 13
 
14 14
 SEXP normalizeBAF(SEXP *, SEXP *);
15
-
Browse code

crlmm on github

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

Rob Scharp authored on 04/10/2011 16:11:02
Showing 1 changed files
... ...
@@ -12,3 +12,4 @@ SEXP gtypeCallerPart2(SEXP *, SEXP *, SEXP *, SEXP *,
12 12
                       SEXP *, SEXP *, SEXP *);
13 13
 
14 14
 SEXP normalizeBAF(SEXP *, SEXP *);
15
+
Browse code

bringing changes from GitHub; from now on, keeping code on BioC servers

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

Benilton Carvalho authored on 03/10/2011 18:12:55
Showing 1 changed files
... ...
@@ -10,3 +10,5 @@ SEXP gtypeCallerPart2(SEXP *, SEXP *, SEXP *, SEXP *,
10 10
                       SEXP *, SEXP *, SEXP *, SEXP *,
11 11
 		      SEXP *, SEXP *, SEXP *, SEXP *,
12 12
                       SEXP *, SEXP *, SEXP *);
13
+
14
+SEXP normalizeBAF(SEXP *, SEXP *);
Browse code

Removed unneeded C-code and cleaned some crlmm functions

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

Benilton Carvalho authored on 14/11/2009 17:26:14
Showing 1 changed files
... ...
@@ -1,30 +1,6 @@
1 1
 #include <R.h>
2 2
 #include <Rinternals.h>
3 3
 
4
-
5
-SEXP gtypeCallerPart1nm(SEXP *, SEXP *, SEXP *, SEXP *, SEXP *,SEXP *, SEXP *,
6
-		        SEXP *, SEXP *, SEXP *, SEXP *, SEXP *,SEXP *, SEXP *,
7
-                        SEXP *, SEXP *, SEXP *);
8
-
9
-SEXP gtypeCallerPart2nm(SEXP *, SEXP *, SEXP *, SEXP *,
10
-		      SEXP *, SEXP *, SEXP *, SEXP *,
11
-                      SEXP *, SEXP *, SEXP *, SEXP *,
12
-		      SEXP *, SEXP *, SEXP *, SEXP *,
13
-                      SEXP *, SEXP *, SEXP *);
14
-
15
-SEXP test (SEXP *);
16
-
17
-SEXP gtypeCallerPart1NormalNoN(SEXP *, SEXP *, SEXP *, SEXP *,SEXP *, SEXP *,
18
-                               SEXP *, SEXP *, SEXP *, SEXP *,SEXP *, SEXP *,
19
-		               SEXP *, SEXP *, SEXP *, SEXP *,SEXP *);
20
-
21
-SEXP gtypeCallerPart2NormalNoN(SEXP *, SEXP *, SEXP *, SEXP *,
22
-		      SEXP *, SEXP *, SEXP *, SEXP *,
23
-                      SEXP *, SEXP *, SEXP *, SEXP *,
24
-		      SEXP *, SEXP *, SEXP *, SEXP *,
25
-                      SEXP *, SEXP *, SEXP *);
26
-
27
-
28 4
 SEXP gtypeCallerPart1(SEXP *, SEXP *, SEXP *, SEXP *,SEXP *, SEXP *,
29 5
 		      SEXP *, SEXP *, SEXP *, SEXP *,SEXP *, SEXP *,
30 6
 		      SEXP *, SEXP *, SEXP *, SEXP *,SEXP *);
... ...
@@ -34,16 +10,3 @@ SEXP gtypeCallerPart2(SEXP *, SEXP *, SEXP *, SEXP *,
34 10
                       SEXP *, SEXP *, SEXP *, SEXP *,
35 11
 		      SEXP *, SEXP *, SEXP *, SEXP *,
36 12
                       SEXP *, SEXP *, SEXP *);
37
-
38
-SEXP gtypeCallerPart1TNoN(SEXP *, SEXP *, SEXP *, SEXP *,
39
-		          SEXP *, SEXP *, SEXP *, SEXP *,
40
-                          SEXP *, SEXP *, SEXP *, SEXP *,
41
-		          SEXP *, SEXP *, SEXP *,
42
-			  SEXP *, SEXP *);
43
-
44
-
45
-SEXP gtypeCallerPart2TNoN(SEXP *, SEXP *, SEXP *, SEXP *,
46
-			  SEXP *, SEXP *, SEXP *, SEXP *, 
47
-			  SEXP *, SEXP *, SEXP *, SEXP *,
48
-			  SEXP *, SEXP *, SEXP *, SEXP *,
49
-			  SEXP *, SEXP *, SEXP *);
Browse code

Fixing registration of C functions

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

Benilton Carvalho authored on 16/01/2009 12:52:10
Showing 1 changed files
... ...
@@ -6,6 +6,11 @@ SEXP gtypeCallerPart1nm(SEXP *, SEXP *, SEXP *, SEXP *, SEXP *,SEXP *, SEXP *,
6 6
 		        SEXP *, SEXP *, SEXP *, SEXP *, SEXP *,SEXP *, SEXP *,
7 7
                         SEXP *, SEXP *, SEXP *);
8 8
 
9
+SEXP gtypeCallerPart2nm(SEXP *, SEXP *, SEXP *, SEXP *,
10
+		      SEXP *, SEXP *, SEXP *, SEXP *,
11
+                      SEXP *, SEXP *, SEXP *, SEXP *,
12
+		      SEXP *, SEXP *, SEXP *, SEXP *,
13
+                      SEXP *, SEXP *, SEXP *);
9 14
 
10 15
 SEXP test (SEXP *);
11 16
 
... ...
@@ -13,6 +18,17 @@ SEXP gtypeCallerPart1NormalNoN(SEXP *, SEXP *, SEXP *, SEXP *,SEXP *, SEXP *,
13 18
                                SEXP *, SEXP *, SEXP *, SEXP *,SEXP *, SEXP *,
14 19
 		               SEXP *, SEXP *, SEXP *, SEXP *,SEXP *);
15 20
 
21
+SEXP gtypeCallerPart2NormalNoN(SEXP *, SEXP *, SEXP *, SEXP *,
22
+		      SEXP *, SEXP *, SEXP *, SEXP *,
23
+                      SEXP *, SEXP *, SEXP *, SEXP *,
24
+		      SEXP *, SEXP *, SEXP *, SEXP *,
25
+                      SEXP *, SEXP *, SEXP *);
26
+
27
+
28
+SEXP gtypeCallerPart1(SEXP *, SEXP *, SEXP *, SEXP *,SEXP *, SEXP *,
29
+		      SEXP *, SEXP *, SEXP *, SEXP *,SEXP *, SEXP *,
30
+		      SEXP *, SEXP *, SEXP *, SEXP *,SEXP *);
31
+
16 32
 SEXP gtypeCallerPart2(SEXP *, SEXP *, SEXP *, SEXP *,
17 33
 		      SEXP *, SEXP *, SEXP *, SEXP *,
18 34
                       SEXP *, SEXP *, SEXP *, SEXP *,
... ...
@@ -23,11 +39,11 @@ SEXP gtypeCallerPart1TNoN(SEXP *, SEXP *, SEXP *, SEXP *,
23 39
 		          SEXP *, SEXP *, SEXP *, SEXP *,
24 40
                           SEXP *, SEXP *, SEXP *, SEXP *,
25 41
 		          SEXP *, SEXP *, SEXP *,
26
-		      SEXP *, SEXP *)
42
+			  SEXP *, SEXP *);
27 43
 
28 44
 
29 45
 SEXP gtypeCallerPart2TNoN(SEXP *, SEXP *, SEXP *, SEXP *,
30 46
 			  SEXP *, SEXP *, SEXP *, SEXP *, 
31 47
 			  SEXP *, SEXP *, SEXP *, SEXP *,
32 48
 			  SEXP *, SEXP *, SEXP *, SEXP *,
33
-			  SEXP *, SEXP *, SEXP *)
34 49
\ No newline at end of file
50
+			  SEXP *, SEXP *, SEXP *);
Browse code

Added registration for C functions

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

Nishant Gopalakrishnan authored on 16/01/2009 00:50:49
Showing 1 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,33 @@
1
+#include <R.h>
2
+#include <Rinternals.h>
3
+
4
+
5
+SEXP gtypeCallerPart1nm(SEXP *, SEXP *, SEXP *, SEXP *, SEXP *,SEXP *, SEXP *,
6
+		        SEXP *, SEXP *, SEXP *, SEXP *, SEXP *,SEXP *, SEXP *,
7
+                        SEXP *, SEXP *, SEXP *);
8
+
9
+
10
+SEXP test (SEXP *);
11
+
12
+SEXP gtypeCallerPart1NormalNoN(SEXP *, SEXP *, SEXP *, SEXP *,SEXP *, SEXP *,
13
+                               SEXP *, SEXP *, SEXP *, SEXP *,SEXP *, SEXP *,
14
+		               SEXP *, SEXP *, SEXP *, SEXP *,SEXP *);
15
+
16
+SEXP gtypeCallerPart2(SEXP *, SEXP *, SEXP *, SEXP *,
17
+		      SEXP *, SEXP *, SEXP *, SEXP *,
18
+                      SEXP *, SEXP *, SEXP *, SEXP *,
19
+		      SEXP *, SEXP *, SEXP *, SEXP *,
20
+                      SEXP *, SEXP *, SEXP *);
21
+
22
+SEXP gtypeCallerPart1TNoN(SEXP *, SEXP *, SEXP *, SEXP *,
23
+		          SEXP *, SEXP *, SEXP *, SEXP *,
24
+                          SEXP *, SEXP *, SEXP *, SEXP *,
25
+		          SEXP *, SEXP *, SEXP *,
26
+		      SEXP *, SEXP *)
27
+
28
+
29
+SEXP gtypeCallerPart2TNoN(SEXP *, SEXP *, SEXP *, SEXP *,
30
+			  SEXP *, SEXP *, SEXP *, SEXP *, 
31
+			  SEXP *, SEXP *, SEXP *, SEXP *,
32
+			  SEXP *, SEXP *, SEXP *, SEXP *,
33
+			  SEXP *, SEXP *, SEXP *)
0 34
\ No newline at end of file