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
Showing1 changed files
... ...
@@ -2,12 +2,17 @@
2 2
 #include <R_ext/Rdynload.h>
3 3
 #include "crlmm.h"
4 4
 #include <Rinternals.h>
5
-#include <R_ext/Rdynload.h>
6 5
 
7 6
 static const R_CallMethodDef CallEntries[] = {
8 7
     {"gtypeCallerPart1", (DL_FUNC)&gtypeCallerPart1, 17},
9 8
     {"gtypeCallerPart2", (DL_FUNC)&gtypeCallerPart2, 19},
10 9
     {"normalizeBAF", (DL_FUNC)&normalizeBAF, 2},
10
+    {"krlmmComputeM", (DL_FUNC)&krlmmComputeM, 2},
11
+    {"krlmmComputeS", (DL_FUNC)&krlmmComputeS, 2},
12
+    {"readGenCallOutputCFunc", (DL_FUNC)&readGenCallOutputCFunc, 8},
13
+    {"krlmmConfidenceScore", (DL_FUNC)&krlmmConfidenceScore, 2},
14
+    {"krlmmHardyweinberg", (DL_FUNC)&krlmmHardyweinberg, 1},
15
+    {"countFileLines", (DL_FUNC)&countFileLines, 1},
11 16
     {NULL, NULL, 0}
12 17
 };
13 18
 
... ...
@@ -15,7 +20,6 @@ void R_init_crlmm(DllInfo *dll){
15 20
     R_registerRoutines(dll, NULL, CallEntries, NULL, NULL);
16 21
 }
17 22
 
18
-
19 23
 SEXP subColSummarizeMedianPP(SEXP RMatrix, SEXP R_rowIndexList){
20 24
   static SEXP(*fun)(SEXP, SEXP) = NULL;
21 25
   if (fun == NULL)
Browse code

merge with collab branch containing fix for dqrls and bug-fix for computeRBaf that can misalign sample index with batch index (when batch is not in alphabetical order)

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

Rob Scharp authored on 17/11/2012 15:24:46
Showing1 changed files
... ...
@@ -1,6 +1,8 @@
1 1
 #include <R.h>
2 2
 #include <R_ext/Rdynload.h>
3 3
 #include "crlmm.h"
4
+#include <Rinternals.h>
5
+#include <R_ext/Rdynload.h>
4 6
 
5 7
 static const R_CallMethodDef CallEntries[] = {
6 8
     {"gtypeCallerPart1", (DL_FUNC)&gtypeCallerPart1, 17},
... ...
@@ -12,3 +14,11 @@ static const R_CallMethodDef CallEntries[] = {
12 14
 void R_init_crlmm(DllInfo *dll){
13 15
     R_registerRoutines(dll, NULL, CallEntries, NULL, NULL);
14 16
 }
17
+
18
+
19
+SEXP subColSummarizeMedianPP(SEXP RMatrix, SEXP R_rowIndexList){
20
+  static SEXP(*fun)(SEXP, SEXP) = NULL;
21
+  if (fun == NULL)
22
+    fun =  (SEXP(*)(SEXP, SEXP))R_GetCCallable("preprocessCore","R_subColSummarize_median");
23
+  return fun(RMatrix, R_rowIndexList);
24
+}
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
Showing1 changed files
... ...
@@ -10,5 +10,5 @@ static const R_CallMethodDef CallEntries[] = {
10 10
 };
11 11
 
12 12
 void R_init_crlmm(DllInfo *dll){
13
-    R_registerRoutines(dll, NULL, CallEntries, NULL, NULL);    
13
+    R_registerRoutines(dll, NULL, CallEntries, NULL, NULL);
14 14
 }
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
Showing1 changed files
... ...
@@ -5,6 +5,7 @@
5 5
 static const R_CallMethodDef CallEntries[] = {
6 6
     {"gtypeCallerPart1", (DL_FUNC)&gtypeCallerPart1, 17},
7 7
     {"gtypeCallerPart2", (DL_FUNC)&gtypeCallerPart2, 19},
8
+    {"normalizeBAF", (DL_FUNC)&normalizeBAF, 2},
8 9
     {NULL, NULL, 0}
9 10
 };
10 11
 
Browse code

Fixes on C code and dependencies on oligoClasses

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

Benilton Carvalho authored on 15/11/2009 12:54:26
Showing1 changed files
... ...
@@ -3,20 +3,11 @@
3 3
 #include "crlmm.h"
4 4
 
5 5
 static const R_CallMethodDef CallEntries[] = {
6
-    {"test", (DL_FUNC)&test, 1},
7
-    {"gtypeCallerPart1nm", (DL_FUNC)&gtypeCallerPart1nm, 17},
8
-    {"gtypeCallerPart2nm", (DL_FUNC)&gtypeCallerPart2nm, 19},
9
-    {"gtypeCallerPart1NormalNoN", (DL_FUNC)&gtypeCallerPart1NormalNoN, 17},
10 6
     {"gtypeCallerPart1", (DL_FUNC)&gtypeCallerPart1, 17},
11 7
     {"gtypeCallerPart2", (DL_FUNC)&gtypeCallerPart2, 19},
12
-    {"gtypeCallerPart1TNoN", (DL_FUNC)&gtypeCallerPart1TNoN, 17},
13
-    {"gtypeCallerPart2TNoN", (DL_FUNC)&gtypeCallerPart2TNoN, 19},
14 8
     {NULL, NULL, 0}
15 9
 };
16 10
 
17 11
 void R_init_crlmm(DllInfo *dll){
18 12
     R_registerRoutines(dll, NULL, CallEntries, NULL, NULL);    
19 13
 }
20
-
21
-
22
-
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
Showing1 changed files
... ...
@@ -14,8 +14,7 @@ static const R_CallMethodDef CallEntries[] = {
14 14
     {NULL, NULL, 0}
15 15
 };
16 16
 
17
-void R_init_crlmm(DllInfo *dll)
18
-{
17
+void R_init_crlmm(DllInfo *dll){
19 18
     R_registerRoutines(dll, NULL, CallEntries, NULL, NULL);    
20 19
 }
21 20
 
Browse code

edited the registration fucntion

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

Nishant Gopalakrishnan authored on 16/01/2009 01:00:38
Showing1 changed files
... ...
@@ -14,7 +14,7 @@ static const R_CallMethodDef CallEntries[] = {
14 14
     {NULL, NULL, 0}
15 15
 };
16 16
 
17
-void R_init_flowCore(DllInfo *dll)
17
+void R_init_crlmm(DllInfo *dll)
18 18
 {
19 19
     R_registerRoutines(dll, NULL, CallEntries, NULL, NULL);    
20 20
 }
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
Showing1 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,23 @@
1
+#include <R.h>
2
+#include <R_ext/Rdynload.h>
3
+#include "crlmm.h"
4
+
5
+static const R_CallMethodDef CallEntries[] = {
6
+    {"test", (DL_FUNC)&test, 1},
7
+    {"gtypeCallerPart1nm", (DL_FUNC)&gtypeCallerPart1nm, 17},
8
+    {"gtypeCallerPart2nm", (DL_FUNC)&gtypeCallerPart2nm, 19},
9
+    {"gtypeCallerPart1NormalNoN", (DL_FUNC)&gtypeCallerPart1NormalNoN, 17},
10
+    {"gtypeCallerPart1", (DL_FUNC)&gtypeCallerPart1, 17},
11
+    {"gtypeCallerPart2", (DL_FUNC)&gtypeCallerPart2, 19},
12
+    {"gtypeCallerPart1TNoN", (DL_FUNC)&gtypeCallerPart1TNoN, 17},
13
+    {"gtypeCallerPart2TNoN", (DL_FUNC)&gtypeCallerPart2TNoN, 19},
14
+    {NULL, NULL, 0}
15
+};
16
+
17
+void R_init_flowCore(DllInfo *dll)
18
+{
19
+    R_registerRoutines(dll, NULL, CallEntries, NULL, NULL);    
20
+}
21
+
22
+
23
+