@@ -160,7 +160,7 @@ where
160
160
/// Takes `world`, a matrix of 3D world coordinates, and `cam` a matrix of 2D
161
161
/// camera coordinates, which is the image of the world coordinates via the
162
162
/// desired projection matrix. Generic over `N`, the number of points, which
163
- /// must be at least `nalgebra::U6`, and can also be `nalgebra::Dynamic `. Also
163
+ /// must be at least `nalgebra::U6`, and can also be `nalgebra::Dyn `. Also
164
164
/// generic over `R`, the data type, which must implement `nalgebra::RealField`.
165
165
///
166
166
/// You may find it more ergonomic to use the
@@ -255,10 +255,10 @@ pub fn dlt_corresponding<R: RealField + Copy>(
255
255
points : & [ CorrespondingPoint < R > ] ,
256
256
epsilon : R ,
257
257
) -> Result < SMatrix < R , 3 , 4 > , & ' static str > {
258
- let nrows = nalgebra:: Dynamic :: from_usize ( points. len ( ) ) ;
259
- // let u2 = nalgebra::Dynamic ::from_usize(2);
258
+ let nrows = nalgebra:: Dyn :: from_usize ( points. len ( ) ) ;
259
+ // let u2 = nalgebra::Dyn ::from_usize(2);
260
260
let u2 = U2 :: from_usize ( 2 ) ;
261
- // let u3 = nalgebra::Dynamic ::from_usize(3);
261
+ // let u3 = nalgebra::Dyn ::from_usize(3);
262
262
let u3 = U3 :: from_usize ( 3 ) ;
263
263
264
264
let world_mat = nalgebra:: OMatrix :: from_fn_generic ( nrows, u3, |i, j| points[ i] . object_point [ j] ) ;
@@ -271,7 +271,7 @@ pub fn dlt_corresponding<R: RealField + Copy>(
271
271
272
272
#[ cfg( test) ]
273
273
mod tests {
274
- use nalgebra:: { Dynamic , OMatrix , U2 , U3 , U4 , U8 } ;
274
+ use nalgebra:: { Dyn , OMatrix , U2 , U3 , U4 , U8 } ;
275
275
276
276
#[ test]
277
277
fn test_dlt_corresponding ( ) {
@@ -332,7 +332,7 @@ mod tests {
332
332
333
333
let n_points = x3dh_data. len ( ) / 4 ;
334
334
335
- let x3dh = OMatrix :: < _ , Dynamic , U4 > :: from_row_slice ( & x3dh_data) ;
335
+ let x3dh = OMatrix :: < _ , Dyn , U4 > :: from_row_slice ( & x3dh_data) ;
336
336
337
337
// example camera calibration matrix
338
338
#[ rustfmt:: skip]
@@ -355,7 +355,7 @@ mod tests {
355
355
data. push ( r / t) ;
356
356
data. push ( s / t) ;
357
357
}
358
- let x2d_expected = OMatrix :: < _ , Dynamic , U2 > :: from_row_slice ( & data) ;
358
+ let x2d_expected = OMatrix :: < _ , Dyn , U2 > :: from_row_slice ( & data) ;
359
359
360
360
// convert homogeneous 3D coords into normal 3D coords
361
361
let x3d = x3dh. fixed_columns :: < 3 > ( 0 ) . into_owned ( ) ;
@@ -374,7 +374,7 @@ mod tests {
374
374
data. push ( r / t) ;
375
375
data. push ( s / t) ;
376
376
}
377
- let x2d_actual = OMatrix :: < _ , Dynamic , U2 > :: from_row_slice ( & data) ;
377
+ let x2d_actual = OMatrix :: < _ , Dyn , U2 > :: from_row_slice ( & data) ;
378
378
379
379
assert_eq ! ( x2d_expected. nrows( ) , x2d_actual. nrows( ) ) ;
380
380
assert_eq ! ( x2d_expected. ncols( ) , x2d_actual. ncols( ) ) ;
0 commit comments