[SPTK-CVS] SPTK4/src levdur.cc,1.6,1.7 lpc.cc,1.4,1.5

[fujishita t. <fjs...@us...>]

Update of /cvsroot/sp-tk/SPTK4/src
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26495

Modified Files:
	levdur.cc lpc.cc 
Log Message:
modify option name

Index: lpc.cc
===================================================================
RCS file: /cvsroot/sp-tk/SPTK4/src/lpc.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** lpc.cc	24 Nov 2016 04:16:56 -0000	1.4
--- lpc.cc	13 Jan 2017 03:21:09 -0000	1.5
***************
*** 78,82 ****
    *stream << "       -f f  : minimum value of the determinant of     [" << kDefaultEpsilon << "]" << std::endl;  // NOLINT
    *stream << "               the normal matrix" << std::endl;
!   *stream << "       -c c  : check whether the derived linear        [0]" << std::endl;  // NOLINT
    *stream << "               predictive coefficients are stable" << std::endl;
    *stream << "                 0 (the check is not performed)" << std::endl;
--- 78,82 ----
    *stream << "       -f f  : minimum value of the determinant of     [" << kDefaultEpsilon << "]" << std::endl;  // NOLINT
    *stream << "               the normal matrix" << std::endl;
!   *stream << "       -e e  : check whether the derived linear        [0]" << std::endl;  // NOLINT
    *stream << "               predictive coefficients are stable" << std::endl;
    *stream << "                 0 (the check is not performed)" << std::endl;
***************
*** 106,110 ****
  
    for (;;) {
!     const char option_char(getopt(argc, argv, "l:m:f:c:h"));
      if (-1 == option_char) break;
  
--- 106,110 ----
  
    for (;;) {
!     const char option_char(getopt(argc, argv, "l:m:f:e:h"));
      if (-1 == option_char) break;
  
***************
*** 142,150 ****
          break;
        }
!       case 'c': {
          int given_integer(-1);
          if (!sptk::ConvertStringToInteger(optarg, &given_integer)) {
            std::ostringstream error_message;
!           error_message << "The argument for the -c option must be an integer";
            sptk::PrintErrorMessage("lpc", error_message);
            return 1;
--- 142,150 ----
          break;
        }
!       case 'e': {
          int given_integer(-1);
          if (!sptk::ConvertStringToInteger(optarg, &given_integer)) {
            std::ostringstream error_message;
!           error_message << "The argument for the -e option must be an integer";
            sptk::PrintErrorMessage("lpc", error_message);
            return 1;
***************
*** 155,159 ****
          if (!sptk::IsInRange(given_integer, min, max)) {
            std::ostringstream error_message;
!           error_message << "The argument for the -c option must be in range"
                          << " (" << min << " .. " << max << ")";
            sptk::PrintErrorMessage("lpc", error_message);
--- 155,159 ----
          if (!sptk::IsInRange(given_integer, min, max)) {
            std::ostringstream error_message;
!           error_message << "The argument for the -e option must be in range"
                          << " (" << min << " .. " << max << ")";
            sptk::PrintErrorMessage("lpc", error_message);

Index: levdur.cc
===================================================================
RCS file: /cvsroot/sp-tk/SPTK4/src/levdur.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** levdur.cc	26 Dec 2016 07:41:20 -0000	1.6
--- levdur.cc	13 Jan 2017 03:21:09 -0000	1.7
***************
*** 76,80 ****
    *stream << "       -f f  : minimum value of the determinant of    [" << kDefaultEpsilon << "]" << std::endl;  // NOLINT
    *stream << "               the normal matrix" << std::endl;
!   *stream << "       -c c  : check whether the derived linear       [0]" << std::endl;  // NOLINT
    *stream << "               predictive coefficients are stable" << std::endl;
    *stream << "                 0 (the check is not performed)" << std::endl;
--- 76,80 ----
    *stream << "       -f f  : minimum value of the determinant of    [" << kDefaultEpsilon << "]" << std::endl;  // NOLINT
    *stream << "               the normal matrix" << std::endl;
!   *stream << "       -e e  : check whether the derived linear       [0]" << std::endl;  // NOLINT
    *stream << "               predictive coefficients are stable" << std::endl;
    *stream << "                 0 (the check is not performed)" << std::endl;
***************
*** 103,107 ****
  
    for (;;) {
!     const char option_char(getopt(argc, argv, "m:f:c:h"));
      if (-1 == option_char) break;
  
--- 103,107 ----
  
    for (;;) {
!     const char option_char(getopt(argc, argv, "m:f:e:h"));
      if (-1 == option_char) break;
  
***************
*** 128,136 ****
          break;
        }
!       case 'c': {
          int given_integer(-1);
          if (!sptk::ConvertStringToInteger(optarg, &given_integer)) {
            std::ostringstream error_message;
!           error_message << "The argument for the -c option must be an integer";
            sptk::PrintErrorMessage("levdur", error_message);
            return 1;
--- 128,136 ----
          break;
        }
!       case 'e': {
          int given_integer(-1);
          if (!sptk::ConvertStringToInteger(optarg, &given_integer)) {
            std::ostringstream error_message;
!           error_message << "The argument for the -e option must be an integer";
            sptk::PrintErrorMessage("levdur", error_message);
            return 1;
***************
*** 141,145 ****
          if (!sptk::IsInRange(given_integer, min, max)) {
            std::ostringstream error_message;
!           error_message << "The argument for the -c option must be in range"
                          << " (" << min << " .. " << max << ")";
            sptk::PrintErrorMessage("levdur", error_message);
--- 141,145 ----
          if (!sptk::IsInRange(given_integer, min, max)) {
            std::ostringstream error_message;
!           error_message << "The argument for the -e option must be in range"
                          << " (" << min << " .. " << max << ")";
            sptk::PrintErrorMessage("levdur", error_message);