[SPTK-CVS] SPTK4/src all_pole_digital_filter.cc, 1.3, 1.4 all_pole_digital_filter.h, 1.3, 1.4 all_zero_digital_filter.cc, 1.2, 1.3 all_zero_digital_filter.h, 1.2, 1.3 poledf.cc, 1.3, 1.4 zerodf.cc, 1.1, 1.2

[Takenori Y. <tak...@us...>]

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

Modified Files:
	all_pole_digital_filter.cc all_pole_digital_filter.h 
	all_zero_digital_filter.cc all_zero_digital_filter.h poledf.cc 
	zerodf.cc 
Log Message:
modify filter classes for checking arguments

Index: all_zero_digital_filter.cc
===================================================================
RCS file: /cvsroot/sp-tk/SPTK4/src/all_zero_digital_filter.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** all_zero_digital_filter.cc	11 Oct 2016 06:01:28 -0000	1.2
--- all_zero_digital_filter.cc	11 Oct 2016 06:38:27 -0000	1.3
***************
*** 58,62 ****
        static_cast<std::size_t>(num_filter_order_ + 1) ||
        NULL == filter_output ||
!       NULL == stored_signals) {
      return false;
    }
--- 58,63 ----
        static_cast<std::size_t>(num_filter_order_ + 1) ||
        NULL == filter_output ||
!       NULL == stored_signals ||
!       !is_valid_) {
      return false;
    }

Index: all_zero_digital_filter.h
===================================================================
RCS file: /cvsroot/sp-tk/SPTK4/src/all_zero_digital_filter.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** all_zero_digital_filter.h	11 Oct 2016 06:01:28 -0000	1.2
--- all_zero_digital_filter.h	11 Oct 2016 06:38:27 -0000	1.3
***************
*** 80,85 ****
  
    //
!   AllZeroDigitalFilter(int num_filter_order, bool transposition) :
!       num_filter_order_(num_filter_order), transposition_(transposition) {}
  
    //
--- 80,90 ----
  
    //
!   AllZeroDigitalFilter(int num_filter_order, bool transposition)
!       : num_filter_order_(num_filter_order), transposition_(transposition),
!         is_valid_(true) {
!     if (num_filter_order_ < 0) {
!       is_valid_ = false;
!     }
!   }
  
    //
***************
*** 97,100 ****
--- 102,110 ----
  
    //
+   bool IsValid() const {
+     return is_valid_;
+   }
+ 
+   //
    bool Run(const std::vector<double>& filter_coefficients,
             double filter_input, double* filter_output,
***************
*** 109,112 ****
--- 119,125 ----
  
    //
+   bool is_valid_;
+ 
+   //
    DISALLOW_COPY_AND_ASSIGN(AllZeroDigitalFilter);
  };

Index: all_pole_digital_filter.cc
===================================================================
RCS file: /cvsroot/sp-tk/SPTK4/src/all_pole_digital_filter.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** all_pole_digital_filter.cc	8 Oct 2016 15:14:58 -0000	1.3
--- all_pole_digital_filter.cc	11 Oct 2016 06:38:27 -0000	1.4
***************
*** 58,62 ****
        static_cast<std::size_t>(num_filter_order_ + 1) ||
        NULL == filter_output ||
!       NULL == stored_signals) {
      return false;
    }
--- 58,63 ----
        static_cast<std::size_t>(num_filter_order_ + 1) ||
        NULL == filter_output ||
!       NULL == stored_signals ||
!       !is_valid_) {
      return false;
    }

Index: all_pole_digital_filter.h
===================================================================
RCS file: /cvsroot/sp-tk/SPTK4/src/all_pole_digital_filter.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** all_pole_digital_filter.h	8 Oct 2016 15:14:59 -0000	1.3
--- all_pole_digital_filter.h	11 Oct 2016 06:38:27 -0000	1.4
***************
*** 81,86 ****
    //
    AllPoleDigitalFilter(int num_filter_order, bool transposition)
!       : num_filter_order_(num_filter_order),
!         transposition_(transposition) {}
  
    //
--- 81,90 ----
    //
    AllPoleDigitalFilter(int num_filter_order, bool transposition)
!       : num_filter_order_(num_filter_order), transposition_(transposition),
!         is_valid_(true) {
!     if (num_filter_order_ < 0) {
!       is_valid_ = false;
!     }
!   }
  
    //
***************
*** 98,101 ****
--- 102,110 ----
  
    //
+   bool IsValid() const {
+     return is_valid_;
+   }
+ 
+   //
    bool Run(const std::vector<double>& filter_coefficients,
             double filter_input, double* filter_output,
***************
*** 110,113 ****
--- 119,125 ----
  
    //
+   bool is_valid_;
+ 
+   //
    DISALLOW_COPY_AND_ASSIGN(AllPoleDigitalFilter);
  };

Index: zerodf.cc
===================================================================
RCS file: /cvsroot/sp-tk/SPTK4/src/zerodf.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** zerodf.cc	11 Oct 2016 06:01:29 -0000	1.1
--- zerodf.cc	11 Oct 2016 06:38:27 -0000	1.2
***************
*** 219,223 ****
    sptk::AllZeroDigitalFilter::StoredSignals stored_signals;
  
!   if (!interpolation.IsValid()) {
      std::ostringstream error_message;
      error_message << "Failed to set the conditions for filtering";
--- 219,223 ----
    sptk::AllZeroDigitalFilter::StoredSignals stored_signals;
  
!   if (!interpolation.IsValid() || !filter.IsValid()) {
      std::ostringstream error_message;
      error_message << "Failed to set the conditions for filtering";

Index: poledf.cc
===================================================================
RCS file: /cvsroot/sp-tk/SPTK4/src/poledf.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** poledf.cc	10 Oct 2016 14:34:04 -0000	1.3
--- poledf.cc	11 Oct 2016 06:38:27 -0000	1.4
***************
*** 219,223 ****
    sptk::AllPoleDigitalFilter::StoredSignals stored_signals;
  
!   if (!interpolation.IsValid()) {
      std::ostringstream error_message;
      error_message << "Failed to set the conditions for filtering";
--- 219,223 ----
    sptk::AllPoleDigitalFilter::StoredSignals stored_signals;
  
!   if (!interpolation.IsValid() || !filter.IsValid()) {
      std::ostringstream error_message;
      error_message << "Failed to set the conditions for filtering";