11use crate :: error:: Error ;
22
33use nalgebra:: {
4- allocator :: Allocator , DMatrix , DVector , DefaultAllocator , DimName , OMatrix , OVector ,
4+ DMatrix , DVector , DefaultAllocator , DimName , OMatrix , OVector , allocator :: Allocator ,
55} ;
66
77#[ derive( Clone ) ]
@@ -69,8 +69,8 @@ impl KfEstimate {
6969 // assert_eq!(p_rows, p_cols, "P is not square!");
7070
7171 // Self {
72- // x: DMatrix::from_column_slice(D::USIZE , U1::USIZE , x.as_slice()),
73- // p: DMatrix::from_column_slice(D::USIZE , D::USIZE , p.as_slice()),
72+ // x: DMatrix::from_column_slice(D::DIM , U1::DIM , x.as_slice()),
73+ // p: DMatrix::from_column_slice(D::DIM , D::DIM , p.as_slice()),
7474 // }
7575 // }
7676
@@ -89,7 +89,7 @@ impl KfEstimate {
8989
9090 Self {
9191 x : DVector :: from_column_slice ( x. as_slice ( ) ) ,
92- p : DMatrix :: from_column_slice ( D :: USIZE , D :: USIZE , p. as_slice ( ) ) ,
92+ p : DMatrix :: from_column_slice ( D :: DIM , D :: DIM , p. as_slice ( ) ) ,
9393 }
9494 }
9595}
@@ -133,7 +133,7 @@ impl Kalman {
133133 let p_k = f_k * estimate. p * f_k_t + q_k;
134134
135135 let x_k = DVector :: < f64 > :: from_row_slice ( x_k. as_slice ( ) ) ;
136- let p_k = DMatrix :: < f64 > :: from_column_slice ( D :: USIZE , D :: USIZE , p_k. as_slice ( ) ) ;
136+ let p_k = DMatrix :: < f64 > :: from_column_slice ( D :: DIM , D :: DIM , p_k. as_slice ( ) ) ;
137137
138138 self . predicted = KfEstimate :: new ( & x_k, & p_k) ;
139139 self . initialized = true ;
@@ -311,13 +311,13 @@ mod test {
311311
312312 let kfe = KfEstimate :: from_static ( x, p) ;
313313
314- for i in 0 ..U6 :: USIZE {
314+ for i in 0 ..U6 :: DIM {
315315 let x = kfe. x [ i] as usize ;
316316 assert_eq ! ( x, i + 1 ) ;
317317
318- for j in 0 ..U6 :: USIZE {
318+ for j in 0 ..U6 :: DIM {
319319 let p = kfe. p [ ( i, j) ] as usize ;
320- assert_eq ! ( p, i + 1 + j * U6 :: USIZE ) ;
320+ assert_eq ! ( p, i + 1 + j * U6 :: DIM ) ;
321321 }
322322 }
323323 }
0 commit comments