[Genabel-commits] r1110 - in pkg/ProbABEL: doc src

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

Author: lckarssen
Date: 2013-02-26 00:13:14 +0100 (Tue, 26 Feb 2013)
New Revision: 1110

Modified:
   pkg/ProbABEL/doc/ChangeLog
   pkg/ProbABEL/src/command_line_settings.cpp
   pkg/ProbABEL/src/command_line_settings.h
Log:
Changed outfilename from char* to string. This fixes bug #2575.


Modified: pkg/ProbABEL/doc/ChangeLog
===================================================================
--- pkg/ProbABEL/doc/ChangeLog	2013-02-25 22:31:37 UTC (rev 1109)
+++ pkg/ProbABEL/doc/ChangeLog	2013-02-25 23:13:14 UTC (rev 1110)
@@ -1,3 +1,7 @@
+***** v.0.4.0 (2013.)
+* Fixed bug #2575: ProbABEL chooses weird file names if the -o option is
+  not specified.
+
 ***** v.0.3.0 (2013.01.01)
 * This is a major rewrite of several important parts of the ProbABEL
   code. ProbABEL can now make use of the Eigen matrix library

Modified: pkg/ProbABEL/src/command_line_settings.cpp
===================================================================
--- pkg/ProbABEL/src/command_line_settings.cpp	2013-02-25 22:31:37 UTC (rev 1109)
+++ pkg/ProbABEL/src/command_line_settings.cpp	2013-02-25 23:13:14 UTC (rev 1110)
@@ -93,8 +93,9 @@
     return npeople;
 }
 
-char* cmdvars::getOutfilename() const
+string cmdvars::getOutfilename() const
 {
+    cout << "getoutputfilename:" << outfilename << ":\n";
     return outfilename;
 }
 
@@ -298,7 +299,7 @@
         cout << "\t --chrom   = "      << chrom << endl;
     else
         cout << "\t --chrom   = not in output\n";
-    if (outfilename != NULL)
+    if (outfilename.compare("") != 0)
         cout << "\t --out     = "      << outfilename << endl;
     else
         cout << "\t --out     = "      << "regression.out.txt" << endl;
@@ -333,9 +334,9 @@
         interaction = interaction_excluded; //ups
         is_interaction_excluded = true;
     }
-    if (outfilename == NULL)
+    if (outfilename.compare("") == 0)
     {
-        outfilename = (char *) string("regression").c_str();
+        outfilename = string("regression");
     }
 #if COXPH
     if (score)

Modified: pkg/ProbABEL/src/command_line_settings.h
===================================================================
--- pkg/ProbABEL/src/command_line_settings.h	2013-02-25 22:31:37 UTC (rev 1109)
+++ pkg/ProbABEL/src/command_line_settings.h	2013-02-25 23:13:14 UTC (rev 1110)
@@ -20,7 +20,7 @@
     char *mlinfofilename;
     char *genfilename;
     char *mapfilename;
-    char *outfilename;
+    string outfilename;
     char *inverse_filename;
 
     string str_genfilename;
@@ -52,7 +52,7 @@
         mlinfofilename   = NULL;
         genfilename      = NULL;
         mapfilename      = NULL;
-        outfilename      = NULL;
+        outfilename      = string("");
         inverse_filename = NULL;
 
         sep     = " ";
@@ -94,7 +94,7 @@
     int getNohead() const;
     int getNoutcomes() const;
     int getNpeople() const;
-    char* getOutfilename() const;
+    string getOutfilename() const;
     char* getProgramName() const;
     int getRobust() const;
     int getScore() const;