[SPTK-CVS] SPTK4/src c2mpir.cc, 1.1, 1.2 cepstrum_to_minimum_phase_impulse_response.cc, 1.2, 1.3 cepstrum_to_minimum_phase_impulse_response.h, 1.2, 1.3 m_sequence_generation.cc, 1.1, 1.2 m_sequence_generation.h, 1.1, 1.2 mseq.cc, 1.1, 1.2

[Keiichiro O. <ur...@us...>]

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

Modified Files:
	c2mpir.cc cepstrum_to_minimum_phase_impulse_response.cc 
	cepstrum_to_minimum_phase_impulse_response.h 
	m_sequence_generation.cc m_sequence_generation.h mseq.cc 
Log Message:
modify code format

Index: cepstrum_to_minimum_phase_impulse_response.h
===================================================================
RCS file: /cvsroot/sp-tk/SPTK4/src/cepstrum_to_minimum_phase_impulse_response.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** cepstrum_to_minimum_phase_impulse_response.h	6 Oct 2016 10:33:59 -0000	1.2
--- cepstrum_to_minimum_phase_impulse_response.h	7 Oct 2016 01:03:25 -0000	1.3
***************
*** 48,52 ****
  #include <vector>  // std::vector
  
! #include "./sptk_utils.h"
  
  namespace sptk {
--- 48,52 ----
  #include <vector>  // std::vector
  
! #include "sptk_utils.h"
  
  namespace sptk {

Index: m_sequence_generation.h
===================================================================
RCS file: /cvsroot/sp-tk/SPTK4/src/m_sequence_generation.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** m_sequence_generation.h	6 Oct 2016 10:24:54 -0000	1.1
--- m_sequence_generation.h	7 Oct 2016 01:03:25 -0000	1.2
***************
*** 46,50 ****
  #define SPTK_SRC_M_SEQUENCE_GENERATION_H_
  
! #include "./sptk_utils.h"
  
  namespace sptk {
--- 46,50 ----
  #define SPTK_SRC_M_SEQUENCE_GENERATION_H_
  
! #include "sptk_utils.h"
  
  namespace sptk {

Index: cepstrum_to_minimum_phase_impulse_response.cc
===================================================================
RCS file: /cvsroot/sp-tk/SPTK4/src/cepstrum_to_minimum_phase_impulse_response.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** cepstrum_to_minimum_phase_impulse_response.cc	6 Oct 2016 10:33:59 -0000	1.2
--- cepstrum_to_minimum_phase_impulse_response.cc	7 Oct 2016 01:03:25 -0000	1.3
***************
*** 43,47 ****
  // ----------------------------------------------------------------- //
  
! #include "./cepstrum_to_minimum_phase_impulse_response.h"
  
  #include <cmath>      // std::exp
--- 43,47 ----
  // ----------------------------------------------------------------- //
  
! #include "cepstrum_to_minimum_phase_impulse_response.h"
  
  #include <cmath>      // std::exp

Index: mseq.cc
===================================================================
RCS file: /cvsroot/sp-tk/SPTK4/src/mseq.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mseq.cc	6 Oct 2016 10:24:54 -0000	1.1
--- mseq.cc	7 Oct 2016 01:03:25 -0000	1.2
***************
*** 43,58 ****
  // ----------------------------------------------------------------- //
  
! #include <unistd.h>
! #include <fstream>
! #include <iostream>
! #include <sstream>
! #include <vector>
! 
! #include "./m_sequence_generation.h"
! #include "./sptk_utils.h"
  
  namespace {
  
! const int kDefaultNumOutputLength(256);
  
  void PrintUsage(std::ostream* stream) {
--- 43,52 ----
  // ----------------------------------------------------------------- //
  
! #include "m_sequence_generation.h"
! #include "sptk_utils.h"
  
  namespace {
  
! const int kDefaultOutputLength(256);
  
  void PrintUsage(std::ostream* stream) {
***************
*** 63,67 ****
    *stream << "       mseq [ options ] > stdout" << std::endl;
    *stream << "  options:" << std::endl;
!   *stream << "       -l l  : output length      [" << kDefaultNumOutputLength << "]" << std::endl;  // NOLINT
    *stream << "       -h    : print this message" << std::endl;
    *stream << "  stdout:" << std::endl;
--- 57,61 ----
    *stream << "       mseq [ options ] > stdout" << std::endl;
    *stream << "  options:" << std::endl;
!   *stream << "       -l l  : output length      [" << kDefaultOutputLength << "]" << std::endl;  // NOLINT
    *stream << "       -h    : print this message" << std::endl;
    *stream << "  stdout:" << std::endl;
***************
*** 77,81 ****
  
  int main(int argc, char* argv[]) {
!   int num_output_length(kDefaultNumOutputLength);
  
    for (;;) {
--- 71,75 ----
  
  int main(int argc, char* argv[]) {
!   int output_length(kDefaultOutputLength);
  
    for (;;) {
***************
*** 85,89 ****
      switch (option_char) {
        case 'l': {
!         if (!sptk::ConvertStringToInteger(optarg, &num_output_length)) {
            std::ostringstream error_message;
            error_message <<
--- 79,83 ----
      switch (option_char) {
        case 'l': {
!         if (!sptk::ConvertStringToInteger(optarg, &output_length)) {
            std::ostringstream error_message;
            error_message <<
***************
*** 108,116 ****
    sptk::MSequenceGeneration::Buffer buffer;
  
!   for (int i(0); num_output_length < 0 || i < num_output_length; ++i) {
      double output;
      if (!generator.Run(&output, &buffer)) {
        std::ostringstream error_message;
!       error_message << "Failed to generate M sequence";
        sptk::PrintErrorMessage("mseq", error_message);
        return 1;
--- 102,110 ----
    sptk::MSequenceGeneration::Buffer buffer;
  
!   for (int i(0); output_length < 0 || i < output_length; ++i) {
      double output;
      if (!generator.Run(&output, &buffer)) {
        std::ostringstream error_message;
!       error_message << "Failed to generate M-Sequence";
        sptk::PrintErrorMessage("mseq", error_message);
        return 1;

Index: m_sequence_generation.cc
===================================================================
RCS file: /cvsroot/sp-tk/SPTK4/src/m_sequence_generation.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** m_sequence_generation.cc	6 Oct 2016 10:24:54 -0000	1.1
--- m_sequence_generation.cc	7 Oct 2016 01:03:25 -0000	1.2
***************
*** 43,47 ****
  // ----------------------------------------------------------------- //
  
! #include "./m_sequence_generation.h"
  
  namespace {
--- 43,47 ----
  // ----------------------------------------------------------------- //
  
! #include "m_sequence_generation.h"
  
  namespace {

Index: c2mpir.cc
===================================================================
RCS file: /cvsroot/sp-tk/SPTK4/src/c2mpir.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** c2mpir.cc	6 Oct 2016 10:04:46 -0000	1.1
--- c2mpir.cc	7 Oct 2016 01:03:25 -0000	1.2
***************
*** 49,54 ****
  #include <vector>
  
! #include "./cepstrum_to_minimum_phase_impulse_response.h"
! #include "./sptk_utils.h"
  
  namespace {
--- 49,54 ----
  #include <vector>
  
! #include "cepstrum_to_minimum_phase_impulse_response.h"
! #include "sptk_utils.h"
  
  namespace {