Skip to content

Commit 345b570

Browse files
committed
formatting and clippy errors corrected
1 parent 6d88980 commit 345b570

4 files changed

Lines changed: 19 additions & 20 deletions

File tree

core/src/filter.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ impl SigmaPoint {
150150
/// ```
151151
pub fn forward(&mut self, imu_data: IMUData, dt: f64, noise: Option<Vec<f64>>) {
152152
// Propagate the strapdown state using the strapdown equations
153-
self.nav_state = forward(self.nav_state, imu_data, dt);
153+
forward(self.nav_state, imu_data, dt);
154154
let noise_vect = match noise {
155155
None => return, // UKF mode, does not use noise in propagation
156156
Some(v) => v, // Particle filter mode, uses noise in propagation

core/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use clap::Parser;
2-
use csv::{ReaderBuilder, WriterBuilder};
2+
use csv::{ReaderBuilder};
33
use std::error::Error;
44
use std::path::PathBuf;
55
use strapdown::sim::{NavigationResult, TestDataRecord, closed_loop, dead_reckoning};

core/src/sim.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use std::io::{self};
1111
use std::path::Path;
1212

1313
use chrono::{DateTime, Utc};
14-
use nalgebra::{DMatrix, DVector, Rotation3, Vector3};
14+
use nalgebra::{DMatrix, DVector};
1515
use serde::{Deserialize, Serialize};
1616

1717
use crate::earth;
@@ -735,7 +735,7 @@ pub fn dead_reckoning(records: &[TestDataRecord]) -> Vec<NavigationResult> {
735735
first_record.pitch,
736736
first_record.yaw,
737737
);
738-
let mut state = StrapdownState {
738+
let state = StrapdownState {
739739
latitude: first_record.latitude.to_radians(),
740740
longitude: first_record.longitude.to_radians(),
741741
altitude: first_record.altitude,
@@ -773,8 +773,7 @@ pub fn dead_reckoning(records: &[TestDataRecord]) -> Vec<NavigationResult> {
773773
vec![record.acc_x, record.acc_y, record.acc_z],
774774
vec![record.gyro_x, record.gyro_y, record.gyro_z],
775775
);
776-
// Propagate the state forward (replace with stub for now)
777-
state = forward(state, imu_data, dt);
776+
forward(state, imu_data, dt);
778777
results.push(NavigationResult::from((
779778
&current_time,
780779
&state,

core/src/strapdown.rs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -842,7 +842,7 @@ mod tests {
842842
fn rest() {
843843
// Test the forward mechanization with a state at rest
844844
let attitude = Rotation3::identity();
845-
let mut state = StrapdownState::new_from_components(
845+
let state = StrapdownState::new_from_components(
846846
0.0, 0.0, 0.0, 0.0, 0.0, 0.0, attitude, false, true, // NED convention
847847
);
848848
assert_eq!(state.velocity_north, 0.0);
@@ -853,7 +853,7 @@ mod tests {
853853
Vector3::new(0.0, 0.0, 0.0), // No rotation
854854
);
855855
let dt = 1.0; // Example time step in seconds
856-
state = forward(state, imu_data, dt);
856+
forward(state, imu_data, dt);
857857
// After a forward step, the state should still be at rest
858858
assert_approx_eq!(state.latitude, 0.0, 1e-6);
859859
assert_approx_eq!(state.longitude, 0.0, 1e-6);
@@ -1032,12 +1032,12 @@ mod tests {
10321032
fn test_forward_yawing() {
10331033
// Yaw rate only, expect yaw to increase by gyro_z * dt
10341034
let attitude = nalgebra::Rotation3::identity();
1035-
let mut state = StrapdownState::new_from_components(
1035+
let state = StrapdownState::new_from_components(
10361036
0.0, 0.0, 0.0, 0.0, 0.0, 0.0, attitude, false, true,
10371037
);
10381038
let imu_data = IMUData::new_from_vec(vec![0.0, 0.0, 0.0], vec![0.0, 0.0, 0.1]);
10391039
let dt = 1.0;
1040-
state = forward(state, imu_data, dt);
1040+
forward(state, imu_data, dt);
10411041
let (_, _, yaw) = state.attitude.euler_angles();
10421042
assert!((yaw - 0.1).abs() < 1e-3);
10431043
}
@@ -1046,12 +1046,12 @@ mod tests {
10461046
fn test_forward_rolling() {
10471047
// Roll rate only, expect roll to increase by gyro_x * dt
10481048
let attitude = nalgebra::Rotation3::identity();
1049-
let mut state = StrapdownState::new_from_components(
1049+
let state = StrapdownState::new_from_components(
10501050
0.0, 0.0, 0.0, 0.0, 0.0, 0.0, attitude, false, true,
10511051
);
10521052
let imu_data = IMUData::new_from_vec(vec![0.0, 0.0, 0.0], vec![0.1, 0.0, 0.0]);
10531053
let dt = 1.0;
1054-
state = forward(state, imu_data, dt);
1054+
forward(state, imu_data, dt);
10551055
let (roll, _, _) = state.attitude.euler_angles();
10561056
assert!((roll - 0.1).abs() < 1e-3);
10571057
}
@@ -1060,12 +1060,12 @@ mod tests {
10601060
fn test_forward_pitching() {
10611061
// Pitch rate only, expect pitch to increase by gyro_y * dt
10621062
let attitude = nalgebra::Rotation3::identity();
1063-
let mut state = StrapdownState::new_from_components(
1063+
let state = StrapdownState::new_from_components(
10641064
0.0, 0.0, 0.0, 0.0, 0.0, 0.0, attitude, false, true,
10651065
);
10661066
let imu_data = IMUData::new_from_vec(vec![0.0, 0.0, 0.0], vec![0.0, 0.1, 0.0]);
10671067
let dt = 1.0;
1068-
state = forward(state, imu_data, dt);
1068+
forward(state, imu_data, dt);
10691069
let (_, pitch, _) = state.attitude.euler_angles();
10701070
assert!((pitch - 0.1).abs() < 1e-3);
10711071
}
@@ -1074,41 +1074,41 @@ mod tests {
10741074
fn test_forward_velocity_north() {
10751075
// Constant acceleration north, expect velocity_north to increase by accel * dt
10761076
let attitude = nalgebra::Rotation3::identity();
1077-
let mut state = StrapdownState::new_from_components(
1077+
let state = StrapdownState::new_from_components(
10781078
0.0, 0.0, 0.0, 0.0, 0.0, 0.0, attitude, false, true,
10791079
);
10801080
let imu_data = IMUData::new_from_vec(vec![1.0, 0.0, 0.0], vec![0.0, 0.0, 0.0]);
10811081
let dt = 2.0;
1082-
state = forward(state, imu_data, dt);
1082+
forward(state, imu_data, dt);
10831083
assert!((state.velocity_north - 2.0).abs() < 1e-3);
10841084
}
10851085

10861086
#[test]
10871087
fn test_forward_velocity_east() {
10881088
// Constant acceleration east, expect velocity_east to increase by accel * dt
10891089
let attitude = nalgebra::Rotation3::identity();
1090-
let mut state = StrapdownState::new_from_components(
1090+
let state = StrapdownState::new_from_components(
10911091
0.0, 0.0, 0.0, 0.0, 0.0, 0.0, attitude, false, true,
10921092
);
10931093
let imu_data = IMUData::new_from_vec(vec![0.0, 1.0, 0.0], vec![0.0, 0.0, 0.0]);
10941094
let dt = 2.0;
1095-
state = forward(state, imu_data, dt);
1095+
forward(state, imu_data, dt);
10961096
assert!((state.velocity_east - 2.0).abs() < 1e-3);
10971097
}
10981098

10991099
#[test]
11001100
fn test_forward_velocity_down() {
11011101
// Constant acceleration down, expect velocity_down to increase by accel * dt
11021102
let attitude = nalgebra::Rotation3::identity();
1103-
let mut state = StrapdownState::new_from_components(
1103+
let state = StrapdownState::new_from_components(
11041104
0.0, 0.0, 0.0, 0.0, 0.0, 0.0, attitude, false, true,
11051105
);
11061106
let imu_data = IMUData::new_from_vec(
11071107
vec![0.0, 0.0, 2.0 + earth::gravity(&0.0, &0.0)],
11081108
vec![0.0, 0.0, 0.0],
11091109
);
11101110
let dt = 1.0;
1111-
state = forward(state, imu_data, dt);
1111+
forward(state, imu_data, dt);
11121112
assert_approx_eq!(state.velocity_down, 2.0, 1e-3);
11131113
}
11141114
}

0 commit comments

Comments
 (0)