Browse code

fix invalid returns in stub functions

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

Ben Bolstad authored on 19/09/2007 00:22:35
Showing2 changed files

... ...
@@ -1,5 +1,5 @@
1 1
 Package: preprocessCore
2
-Version: 0.99.18
2
+Version: 0.99.19
3 3
 Title: A collection of pre-processing functions
4 4
 Author: Benjamin Milo Bolstad <bmb@bmbolstad.com>
5 5
 Maintainer: Benjamin Milo Bolstad <bmb@bmbolstad.com>
... ...
@@ -10,10 +10,8 @@ void averagelog_no_copy(double *data, int rows, int cols, double *results, doubl
10 10
   if (fun == NULL)
11 11
     fun =  (void(*)(double*, int, int, double *, double *))R_GetCCallable("preprocessCore","averagelog_no_copy");
12 12
   
13
-  return fun(data,rows,cols,results,resultsSE);
14
-
15
-
16
-
13
+  fun(data,rows,cols,results,resultsSE);
14
+  return;
17 15
 }
18 16
 
19 17
 
... ...
@@ -41,7 +39,8 @@ void averagelog(double *data, int rows, int cols, double *results, double *resul
41 39
   if (fun == NULL)
42 40
     fun =  (void(*)(double*, int, int, double *, double *))R_GetCCallable("preprocessCore","averagelog");
43 41
   
44
-  return fun(data,rows,cols,results,resultsSE);
42
+  fun(data,rows,cols,results,resultsSE);
43
+  return;
45 44
 }
46 45
 
47 46
 
... ...
@@ -69,7 +68,8 @@ void AverageLog(double *data, int rows, int cols, int *cur_rows, double *results
69 68
   if (fun == NULL)
70 69
     fun =  (void(*)(double*, int, int, int*, double *, int, double *))R_GetCCallable("preprocessCore","AverageLog");
71 70
   
72
-  return fun(data,rows,cols,cur_rows,results,nprobes,resultsSE);
71
+  fun(data,rows,cols,cur_rows,results,nprobes,resultsSE);
72
+  return;
73 73
 }
74 74
 
75 75
 
... ...
@@ -97,8 +97,8 @@ void AverageLog_noSE(double *data, int rows, int cols, int *cur_rows, double *re
97 97
   
98 98
   if (fun == NULL)
99 99
     fun =  (void(*)(double*, int, int, int*, double *, int))R_GetCCallable("preprocessCore","AverageLog_noSE");
100
-  
101
-  return fun(data,rows,cols,cur_rows,results,nprobes);
100
+  fun(data,rows,cols,cur_rows,results,nprobes);
101
+  return;
102 102
 }
103 103
 
104 104
 
... ...
@@ -125,8 +125,8 @@ void logaverage(double *data, int rows, int cols, double *results, double *resul
125 125
   
126 126
   if (fun == NULL)
127 127
     fun =  (void(*)(double*, int, int, double *, double *))R_GetCCallable("preprocessCore","logaverage");
128
-  
129
-  return fun(data,rows,cols,results,resultsSE);
128
+  fun(data,rows,cols,results,resultsSE);
129
+  return;
130 130
 }
131 131
 
132 132
 
... ...
@@ -155,8 +155,8 @@ void LogAverage(double *data, int rows, int cols, int *cur_rows, double *results
155 155
   
156 156
   if (fun == NULL)
157 157
     fun =  (void(*)(double*, int, int, int*, double *, int, double *))R_GetCCallable("preprocessCore","LogAverage");
158
-  
159
-  return fun(data,rows,cols,cur_rows,results,nprobes,resultsSE);
158
+  fun(data,rows,cols,cur_rows,results,nprobes,resultsSE);
159
+  return;
160 160
 }
161 161
 
162 162
 
... ...
@@ -167,8 +167,8 @@ void tukeybiweight(double *data, int rows, int cols, double *results, double *re
167 167
 
168 168
   if (fun == NULL)
169 169
     fun = (void(*)(double *, int, int, double *, double *))R_GetCCallable("preprocessCore","tukeybiweight");
170
-  
171
-  return fun(data, rows, cols, results, resultsSE);
170
+  fun(data, rows, cols, results, resultsSE);
171
+  return;
172 172
 
173 173
 
174 174
 
... ...
@@ -182,8 +182,8 @@ void TukeyBiweight(double *data, int rows, int cols, int *cur_rows, double *resu
182 182
 
183 183
   if (fun == NULL)
184 184
     fun = (void(*)(double *, int, int, int *, double *, int, double *))R_GetCCallable("preprocessCore","TukeyBiweight");
185
-  
186
-  return fun(data, rows, cols, cur_rows,results, nprobes, resultsSE);
185
+  fun(data, rows, cols, cur_rows,results, nprobes, resultsSE);
186
+  return;
187 187
 
188 188
 
189 189
 }
... ...
@@ -209,8 +209,8 @@ void lm_wfit(double *x, double *y, double *w, int rows, int cols, double tol, do
209 209
   if (fun == NULL)
210 210
     fun = (void(*)(double *, double *, double *, int, int, double, double *, double *))R_GetCCallable("preprocessCore","lm_wfit");
211 211
 
212
-
213
-  return fun(x,y,w,rows,cols,tol,out_beta,out_resids);
212
+  fun(x,y,w,rows,cols,tol,out_beta,out_resids);
213
+  return;
214 214
 
215 215
 }
216 216
 
... ...
@@ -226,8 +226,8 @@ void median_polish_fit_no_copy(double *data, int rows, int cols, double *r, doub
226 226
   if (fun == NULL)
227 227
     fun = (void(*)(double *, int, int, double *, double *, double*))R_GetCCallable("preprocessCore","median_polish_fit_no_copy");
228 228
 
229
-
230
-  return fun(data, rows, cols, r, c, t);
229
+  fun(data, rows, cols, r, c, t);
230
+  return;
231 231
 
232 232
 }
233 233
 
... ...
@@ -237,8 +237,8 @@ void median_polish_no_copy(double *data, int rows, int cols, double *results, do
237 237
 
238 238
   if (fun == NULL)
239 239
     fun = (void(*)(double *, int, int, double *, double *))R_GetCCallable("preprocessCore","median_polish_no_copy");
240
-
241
-  return fun(data,rows,cols,results,resultsSE);
240
+  fun(data,rows,cols,results,resultsSE);
241
+  return;
242 242
 
243 243
 }
244 244
 
... ...
@@ -248,8 +248,8 @@ void median_polish_log2_no_copy(double *data, int rows, int cols, double *result
248 248
 
249 249
   if (fun == NULL)
250 250
     fun = (void(*)(double *, int, int, double *, double *))R_GetCCallable("preprocessCore","median_polish_log2_no_copy");
251
-
252
-  return fun(data,rows,cols,results,resultsSE);
251
+  fun(data,rows,cols,results,resultsSE);
252
+  return;
253 253
 
254 254
 }
255 255
 
... ...
@@ -261,8 +261,8 @@ void median_polish_log2(double *data, int rows, int cols, double *results, doubl
261 261
   if (fun == NULL)
262 262
     fun = (void(*)(double *, int, int, double *, double *, double *))R_GetCCallable("preprocessCore","median_polish_log2");
263 263
   
264
-
265
-  return fun(data,rows,cols,results,resultsSE,residuals);
264
+  fun(data,rows,cols,results,resultsSE,residuals);
265
+  return;
266 266
 
267 267
 }
268 268
 
... ...
@@ -273,8 +273,8 @@ void median_polish(double *data, int rows, int cols, double *results, double *re
273 273
   if (fun == NULL)
274 274
     fun = (void(*)(double *, int, int, double *, double *, double *))R_GetCCallable("preprocessCore","median_polish");
275 275
   
276
-
277
-  return fun(data,rows,cols,results,resultsSE,residuals);
276
+  fun(data,rows,cols,results,resultsSE,residuals);
277
+  return;
278 278
 }
279 279
 
280 280
 
... ...
@@ -304,8 +304,8 @@ void MedianPolish(double *data, int rows, int cols, int *cur_rows, double *resul
304 304
   if (fun == NULL)
305 305
     fun = (void(*)(double *, int, int, int *, double *, int, double *))R_GetCCallable("preprocessCore","MedianPolish");
306 306
 
307
-
308
-  return fun(data,rows,cols,cur_rows,results,nprobes,resultsSE);
307
+  fun(data,rows,cols,cur_rows,results,nprobes,resultsSE);
308
+  return;
309 309
 
310 310
 }
311 311
 
... ...
@@ -319,9 +319,9 @@ void rlm_fit(double *x, double *y, int rows, int cols, double *out_beta, double
319 319
 
320 320
   if (fun == NULL)
321 321
     fun = (void(*)(double *, double *, int, int, double *, double *, double *, double (*)(double, double, int), double, int, int))R_GetCCallable("preprocessCore","rlm_fit");
322
-
323
-
324
-  return fun(x, y, rows, cols, out_beta, out_resids,out_weights, PsiFn, psi_k, max_iter, initialized);
322
+  
323
+  fun(x, y, rows, cols, out_beta, out_resids,out_weights, PsiFn, psi_k, max_iter, initialized);
324
+  return;
325 325
 
326 326
 
327 327
 }
... ...
@@ -336,8 +336,8 @@ void rlm_wfit(double *x, double *y, double *w, int rows, int cols, double *out_b
336 336
   if (fun == NULL)
337 337
     fun = (void(*)(double *, double *, double *, int, int, double *, double *, double *, double (*)(double, double, int), double, int, int))R_GetCCallable("preprocessCore","rlm_wfit");
338 338
 
339
-
340
-  return fun(x, y, w, rows, cols, out_beta, out_resids,out_weights, PsiFn, psi_k, max_iter, initialized);
339
+  fun(x, y, w, rows, cols, out_beta, out_resids,out_weights, PsiFn, psi_k, max_iter, initialized);
340
+  return;
341 341
 
342 342
 
343 343
 
... ...
@@ -372,8 +372,8 @@ void rlm_fit_anova(double *y, int y_rows, int y_cols,double *out_beta, double *o
372 372
   if (fun == NULL)
373 373
     fun = (void(*)(double *, int, int, double *, double *, double *, double (*)(double, double, int), double, int, int))R_GetCCallable("preprocessCore","rlm_fit_anova");
374 374
 
375
-
376
-  return fun(y, y_rows, y_cols, out_beta, out_resids,out_weights, PsiFn, psi_k, max_iter, initialized);
375
+  fun(y, y_rows, y_cols, out_beta, out_resids,out_weights, PsiFn, psi_k, max_iter, initialized);
376
+  return;
377 377
 
378 378
 }
379 379
 
... ...
@@ -386,8 +386,8 @@ void rlm_wfit_anova(double *y, int y_rows, int y_cols, double *w, double *out_be
386 386
   if (fun == NULL)
387 387
     fun = (void(*)(double *, int, int, double *, double *, double *, double *, double (*)(double, double, int), double, int, int))R_GetCCallable("preprocessCore","rlm_wfit_anova");
388 388
 
389
-
390
-  return fun(y, y_rows, y_cols, w, out_beta, out_resids,out_weights, PsiFn, psi_k, max_iter, initialized);
389
+  fun(y, y_rows, y_cols, w, out_beta, out_resids,out_weights, PsiFn, psi_k, max_iter, initialized);
390
+  return;
391 391
 
392 392
 
393 393
 }
... ...
@@ -399,8 +399,8 @@ void rlm_compute_se(double *X,double *Y, int n, int p, double *beta, double *res
399 399
 
400 400
   if (fun == NULL)
401 401
     fun = (void(*)(double *,double *, int, int, double *, double *, double *, double *, double *, double *, int, double (*)(double, double, int), double))R_GetCCallable("preprocessCore","rlm_compute_se");
402
-
403
-  return fun(X, Y, n, p, beta, resids, weights, se_estimates, varcov, residSE, method, PsiFn, psi_k);
402
+  fun(X, Y, n, p, beta, resids, weights, se_estimates, varcov, residSE, method, PsiFn, psi_k);
403
+  return;
404 404
 
405 405
 }
406 406
 
... ...
@@ -412,8 +412,8 @@ void rlm_compute_se_anova(double *Y, int y_rows,int y_cols, double *beta, double
412 412
   if (fun == NULL)
413 413
     fun = (void(*)(double *, int, int, double *, double *,double *,double *, double *, double *, int, double (*)(double, double, int), double))R_GetCCallable("preprocessCore","rlm_compute_se_anova");
414 414
 
415
-  
416
-  return fun(Y, y_rows, y_cols, beta, resids, weights, se_estimates, varcov, residSE, method, PsiFn, psi_k);
415
+  fun(Y, y_rows, y_cols, beta, resids, weights, se_estimates, varcov, residSE, method, PsiFn, psi_k);
416
+  return;
417 417
 
418 418
 }
419 419
 
... ...
@@ -427,8 +427,8 @@ void MedianLog(double *data, int rows, int cols, int *cur_rows, double *results,
427 427
 
428 428
   if (fun == NULL)
429 429
     fun = (void(*)(double *, int, int, int *, double *, int, double *))R_GetCCallable("preprocessCore","MedianLog");
430
-
431
-  return fun(data, rows, cols, cur_rows, results, nprobes, resultsSE);
430
+  fun(data, rows, cols, cur_rows, results, nprobes, resultsSE);
431
+  return;
432 432
 
433 433
 }
434 434
 
... ...
@@ -439,8 +439,8 @@ void MedianLog_noSE(double *data, int rows, int cols, int *cur_rows, double *res
439 439
 
440 440
   if (fun == NULL)
441 441
     fun = (void(*)(double *, int, int, int *, double *, int))R_GetCCallable("preprocessCore","MedianLog_noSE");
442
-
443
-  return fun(data, rows, cols, cur_rows, results, nprobes);
442
+  fun(data, rows, cols, cur_rows, results, nprobes);
443
+  return;
444 444
 
445 445
 }
446 446
 
... ...
@@ -452,8 +452,8 @@ void medianlog(double *data, int rows, int cols, double *results, double *result
452 452
   
453 453
   if (fun == NULL)
454 454
     fun = (void(*)(double *, int, int, double *, double *))R_GetCCallable("preprocessCore","medianlog");
455
-
456
-  return fun(data, rows, cols, results, resultsSE);
455
+  fun(data, rows, cols, results, resultsSE);
456
+  return;
457 457
 
458 458
 }
459 459
 
... ...
@@ -464,8 +464,8 @@ void medianlog_no_copy(double *data, int rows, int cols, double *results, double
464 464
   
465 465
   if (fun == NULL)
466 466
     fun = (void(*)(double *, int, int, double *, double *))R_GetCCallable("preprocessCore","medianlog_no_copy");
467
-
468
-  return fun(data, rows, cols, results, resultsSE);
467
+  fun(data, rows, cols, results, resultsSE);
468
+  return;
469 469
 
470 470
 }
471 471
 
... ...
@@ -477,8 +477,8 @@ void LogMedian(double *data, int rows, int cols, int *cur_rows, double *results,
477 477
 
478 478
   if (fun == NULL)
479 479
     fun = (void(*)(double *, int, int, int *, double *, int, double *))R_GetCCallable("preprocessCore","LogMedian");
480
-
481
-  return fun(data, rows, cols, cur_rows, results, nprobes, resultsSE);
480
+  fun(data, rows, cols, cur_rows, results, nprobes, resultsSE);
481
+  return;
482 482
 
483 483
 }
484 484
 
... ...
@@ -489,8 +489,8 @@ void logmedian(double *data, int rows, int cols, double *results, double *result
489 489
   
490 490
   if (fun == NULL)
491 491
     fun = (void(*)(double *, int, int, double *, double *))R_GetCCallable("preprocessCore","logmedian");
492
-
493
-  return fun(data, rows, cols, results, resultsSE);
492
+  fun(data, rows, cols, results, resultsSE);
493
+  return;
494 494
 
495 495
 }
496 496
 
... ...
@@ -501,7 +501,7 @@ void logmedian_no_copy(double *data, int rows, int cols, double *results, double
501 501
   
502 502
   if (fun == NULL)
503 503
     fun = (void(*)(double *, int, int, double *, double *))R_GetCCallable("preprocessCore","logmedian_no_copy");
504
-
505
-  return fun(data, rows, cols, results, resultsSE);
504
+  fun(data, rows, cols, results, resultsSE);
505
+  return;
506 506
 
507 507
 }