[Genabel-commits] r1305 - pkg/ProbABEL/src

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

Author: lckarssen
Date: 2013-08-25 16:41:36 +0200 (Sun, 25 Aug 2013)
New Revision: 1305

Modified:
   pkg/ProbABEL/src/command_line_settings.cpp
   pkg/ProbABEL/src/usage.cpp
Log:
Correction to previous ProbABEL commit: the unused options need to be listed in the 'case' section anyway, otherwise we get a core dump in case a user still specifies them. 
Also, the --score option seems to be completely depracated. However, let's keep it in for now so we can do a thorough cleanup later.


Modified: pkg/ProbABEL/src/command_line_settings.cpp
===================================================================
--- pkg/ProbABEL/src/command_line_settings.cpp	2013-08-25 14:27:15 UTC (rev 1304)
+++ pkg/ProbABEL/src/command_line_settings.cpp	2013-08-25 14:41:36 UTC (rev 1305)
@@ -208,11 +208,9 @@
         case 'e':
             nohead = 1;
             break;
-#if !COXPH
         case 'r':
             score = 1;
             break;
-#endif
         case 'l':
             allcov = 1;
             break;
@@ -222,14 +220,12 @@
         case 'k':
             interaction_excluded = atoi(optarg);
             break;
-#if !COXPH
         case 'v':
             inverse_filename = optarg;
             break;
         case 'u':
             robust = 1;
             break;
-#endif
 
         case '?':
             print_usage(program_name, 2);
@@ -268,7 +264,7 @@
                  << endl;
         }
         cerr << endl;
-//        print_usage(program_name, 1);
+
         cout << "One or more required command line options appear to be missing."
              << endl
              << "Run " << program_name

Modified: pkg/ProbABEL/src/usage.cpp
===================================================================
--- pkg/ProbABEL/src/usage.cpp	2013-08-25 14:27:15 UTC (rev 1304)
+++ pkg/ProbABEL/src/usage.cpp	2013-08-25 14:41:36 UTC (rev 1305)
@@ -46,9 +46,7 @@
     cout << "\t --separat : [optional] character to separate fields "
          << "(default is space)"
          << endl;
-#if !COXPH
     cout << "\t --score   : use score test" << endl;
-#endif
     cout << "\t --no-head : do not report header line" << endl;
     cout << "\t --allcov  : report estimates for all covariates (large outputs!)"
          << endl;