removed setter methods, replaced by CV_PROP_RW macro

This commit is contained in:
Juan Carlos Niebles
2014-09-18 09:39:35 -05:00
parent 1162f0ed63
commit dc49e11527
2 changed files with 28 additions and 58 deletions

View File

@@ -129,33 +129,16 @@ public:
//! updates the predicted state from the measurement
CV_WRAP const Mat& correct( const Mat& measurement );
//! sets predicted state
CV_WRAP void setStatePre( const Mat& state ) { statePre = state; }
//! sets corrected state
CV_WRAP void setStatePost( const Mat& state ) { statePost = state; }
//! sets transition matrix
CV_WRAP void setTransitionMatrix( const Mat& transition ) { transitionMatrix = transition; }
//! sets control matrix
CV_WRAP void setControlMatrix( const Mat& control ) { controlMatrix = control; }
//! sets measurement matrix
CV_WRAP void setMeasurementMatrix( const Mat& measurement ) { measurementMatrix = measurement; }
//! sets process noise covariance matrix
CV_WRAP void setProcessNoiseCov( const Mat& noise ) { processNoiseCov = noise; }
//! sets measurement noise covariance matrix
CV_WRAP void setMeasurementNoiseCov( const Mat& noise ) { measurementNoiseCov = noise; }
//! sets posteriori error covariance
CV_WRAP void setErrorCovPost( const Mat& error ) { errorCovPost = error; }
Mat statePre; //!< predicted state (x'(k)): x(k)=A*x(k-1)+B*u(k)
Mat statePost; //!< corrected state (x(k)): x(k)=x'(k)+K(k)*(z(k)-H*x'(k))
Mat transitionMatrix; //!< state transition matrix (A)
Mat controlMatrix; //!< control matrix (B) (not used if there is no control)
Mat measurementMatrix; //!< measurement matrix (H)
Mat processNoiseCov; //!< process noise covariance matrix (Q)
Mat measurementNoiseCov;//!< measurement noise covariance matrix (R)
Mat errorCovPre; //!< priori error estimate covariance matrix (P'(k)): P'(k)=A*P(k-1)*At + Q)*/
Mat gain; //!< Kalman gain matrix (K(k)): K(k)=P'(k)*Ht*inv(H*P'(k)*Ht+R)
Mat errorCovPost; //!< posteriori error estimate covariance matrix (P(k)): P(k)=(I-K(k)*H)*P'(k)
CV_PROP_RW Mat statePre; //!< predicted state (x'(k)): x(k)=A*x(k-1)+B*u(k)
CV_PROP_RW Mat statePost; //!< corrected state (x(k)): x(k)=x'(k)+K(k)*(z(k)-H*x'(k))
CV_PROP_RW Mat transitionMatrix; //!< state transition matrix (A)
CV_PROP_RW Mat controlMatrix; //!< control matrix (B) (not used if there is no control)
CV_PROP_RW Mat measurementMatrix; //!< measurement matrix (H)
CV_PROP_RW Mat processNoiseCov; //!< process noise covariance matrix (Q)
CV_PROP_RW Mat measurementNoiseCov;//!< measurement noise covariance matrix (R)
CV_PROP_RW Mat errorCovPre; //!< priori error estimate covariance matrix (P'(k)): P'(k)=A*P(k-1)*At + Q)*/
CV_PROP_RW Mat gain; //!< Kalman gain matrix (K(k)): K(k)=P'(k)*Ht*inv(H*P'(k)*Ht+R)
CV_PROP_RW Mat errorCovPost; //!< posteriori error estimate covariance matrix (P(k)): P(k)=(I-K(k)*H)*P'(k)
// temporary matrices
Mat temp1;