[Genabel-commits] r1616 - pkg/OmicABELnoMM/src

[noreply at r-forge.r-project.org]

Author: afrank
Date: 2014-02-18 17:05:44 +0100 (Tue, 18 Feb 2014)
New Revision: 1616

Modified:
   pkg/OmicABELnoMM/src/Utility.cpp
   pkg/OmicABELnoMM/src/main.cpp
Log:
Removed relevant Jenkins non-style Warnings/Errors.

Modified: pkg/OmicABELnoMM/src/Utility.cpp
===================================================================
--- pkg/OmicABELnoMM/src/Utility.cpp	2014-02-18 15:30:13 UTC (rev 1615)
+++ pkg/OmicABELnoMM/src/Utility.cpp	2014-02-18 16:05:44 UTC (rev 1616)
@@ -182,7 +182,7 @@
 
     cputime_type start_tick, end_tick;
     duration = 9999999999.0;
-    int b;
+    int b = 0;
 
     cout << "\n%%Performing CPU GEMM Benchmark" << endl;
 

Modified: pkg/OmicABELnoMM/src/main.cpp
===================================================================
--- pkg/OmicABELnoMM/src/main.cpp	2014-02-18 15:30:13 UTC (rev 1615)
+++ pkg/OmicABELnoMM/src/main.cpp	2014-02-18 16:05:44 UTC (rev 1616)
@@ -72,10 +72,10 @@
             /* If this option set a flag, do nothing else now. */
             if (long_options[option_index].flag != 0)
                 break;
-            printf ("Long option %s", long_options[option_index].name);
+            printf("Long option %s", long_options[option_index].name);
             if (optarg)
                 printf (" with arg %s", optarg);
-            printf ("\n");
+            printf("\n");
             break;
 
         case 'p':
@@ -84,7 +84,7 @@
 
             pos = string(optarg).find(".");
             if (pos != string::npos)
-                params.fnameY = string(optarg).substr (0, pos);
+                params.fnameY = string(optarg).substr(0, pos);
 
             cout << "using -p with phenotypes from file " << optarg << endl;
             break;
@@ -95,7 +95,7 @@
 
            pos = string(optarg).find(".");
             if (pos != string::npos)
-                params.fnameAR = string(optarg).substr (0, pos);
+                params.fnameAR = string(optarg).substr(0, pos);
 
             cout << "using -g with genotype data from file " << optarg << endl;
             break;
@@ -139,18 +139,18 @@
             break;
 
         default:
-            abort ();
+            abort();
         }
     }
 
     /* Print any remaining command line arguments (not options). */
     if (optind < argc)
     {
-        printf ("non-option ARGV-elements: ");
+        printf("non-option ARGV-elements: ");
         while (optind < argc)
-            printf ("%s ", argv[optind++]);
+            printf("%s ", argv[optind++]);
 
-        putchar ('\n');
+        putchar('\n');
     }
 
     if (!bout || !phe || !cov || !snp)
@@ -165,7 +165,7 @@
 }
 
 
-int main( int argc, char *argv[] )
+int main(int argc, char *argv[] )
 {
     struct Settings params;
 
@@ -180,7 +180,7 @@
     params.r = 1;
     params.threads = 1;
 
-    parse_params(argc, argv,params);
+    parse_params(argc, argv, params);
 
 
     //omp_set_nested(false);
@@ -217,7 +217,7 @@
     }
     else
     {
-        alg.solve(params,out,P_NEQ_B_OPT_MD);
+        alg.solve(params, out, P_NEQ_B_OPT_MD);
     }
 
     return 0;