Skip to content

Commit d18fe72

Browse files
authored
Merge pull request #3 from SalahEddineGhamri/main
update depencies & manage consequences & update readme & add grid_map to lib.rs & add dijkstra motion planning
2 parents eab7219 + b01ba63 commit d18fe72

14 files changed

+3154
-1550
lines changed

Cargo.toml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ edition = "2018"
77
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
88

99
[dependencies]
10-
nalgebra = "0.21"
11-
plotlib = "0.5"
12-
rand = "0.7.3"
10+
nalgebra = "0.32.4"
11+
plotlib = "0.5.1"
12+
rand = "0.8.5"
13+
rand_distr = "0.4.3"
14+
itertools = "0.12.1"
15+
gnuplot = "0.0.42"
16+
ordered-float = "4.2.0"

README.md

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ cargo run --bin ekf
2020
* [Extended kalman filter localization](#extended-kalman-filter-localization)
2121
* Particle filter localization
2222
* [SLAM](#slam)
23-
* Iterative Closest Point
23+
* Iterative Closest Point
2424
* FastSLAM 1.0
2525
* [Path Planning](#path-planning)
2626
* [Bezier Path](#bezier-path)
2727
* [Cubic Spline](#cubic-spline)
2828
* [Dynamic Window Approach](#dynamic-window-approach)
2929
* [Model Predictive Trajectory Generator](#model-predictive-trajectory-generator)
30-
* Dijkstra algorithm
30+
* [Dijkstra algorithm](#dijkstra-algorithm)
3131
* Potential Field algorithm
3232
* State Lattice Planner
3333
* Rapidly-Exploring Random Trees (RRT)
@@ -41,7 +41,7 @@ cargo run --bin ekf
4141
# Localization
4242
## Extended Kalman Filter Localization
4343

44-
<img src="./img/ekf.svg" width="640px">
44+
<img src="./img/ekf.svg" width="640px">
4545

4646

4747
Red:GPS, Brue:Ground Truth, Green:EKF, Yellow:Dead Reckoning
@@ -62,7 +62,7 @@ cargo run --bin ekf
6262
# Path Planning
6363
## Bezier Path
6464

65-
<img src="./img/bezier_path.svg" width="640px">
65+
<img src="./img/bezier_path.svg" width="640px">
6666

6767
Brack:Control points, Green: Path, Red: Start and Goal
6868

@@ -75,7 +75,7 @@ cargo run --bin bezier_path
7575
## Cubic Spline
7676

7777

78-
<img src="./img/csp.svg" width="640px">
78+
<img src="./img/csp.svg" width="640px">
7979

8080
Brack:Control points, Green: Path
8181

@@ -88,7 +88,7 @@ cargo run --bin csp
8888

8989
## Dynamic Window Approach
9090

91-
<img src="./img/dwa.svg" width="640px">
91+
<img src="./img/dwa.svg" width="640px">
9292

9393
Brack: Obstacles, Green: Trajectry, Yellow: Predected trajectry
9494

@@ -100,9 +100,9 @@ cargo run --bin dwa
100100

101101
## Model Predictive Trajectory Generator
102102

103-
<img src="./img/model_predictive_trajectory_generator.svg" width="640px">
103+
<img src="./img/model_predictive_trajectory_generator.svg" width="640px">
104104

105-
Green: Path
105+
Green: Path
106106

107107
- [src](https://github.com/rsasaki0109/RustRobotics/blob/master/src/bin/model_predictive_trajectory_generator.rs)
108108

@@ -112,13 +112,18 @@ cargo run --bin model_predictive_trajectory_generator
112112
```
113113

114114
## Dijkstra algorithm
115+
116+
<img src="./media/dijkstra-motion-planner.gif" width="640px">
117+
118+
- [src](./src/bin/dijkstra.rs)
119+
115120
## Potential Field algorithm
116121
## State Lattice Planner
117122
## Rapidly-Exploring Random Trees
118123

119124
# Path Tracking
120-
## Move to Pose
121-
<img src="./img/move_to_pose.svg" width="640px">
125+
## Move to Pose
126+
<img src="./img/move_to_pose.svg" width="640px">
122127

123128
Green: Path, Red: Start and Goal
124129

@@ -130,9 +135,9 @@ cargo run --bin move_to_pose
130135

131136
## Pure Pursuit
132137

133-
<img src="./img/pure_pursuit.svg" width="640px">
138+
<img src="./img/pure_pursuit.svg" width="640px">
134139

135-
Brack: Planned path, Green: Tracked path
140+
Brack: Planned path, Green: Tracked path
136141

137142
- [src](https://github.com/rsasaki0109/RustRobotics/blob/master/src/bin/pure_pursuit.rs)
138143

@@ -141,25 +146,25 @@ Brack: Planned path, Green: Tracked path
141146
cargo run --bin pure_pursuit
142147
```
143148

144-
## Stanly Control
149+
## Stanly Control
145150

146-
<img src="./img/stanley_control.svg" width="640px">
151+
<img src="./img/stanley_control.svg" width="640px">
147152

148-
Brack: Planned path, Green: Tracked path
153+
Brack: Planned path, Green: Tracked path
149154

150155
- [src](https://github.com/rsasaki0109/RustRobotics/blob/master/src/bin/stanley_controller.rs)
151156

152157

153158
```
154-
cargo run --bin stanley_control
159+
cargo run --bin stanley_controller
155160
```
156161

157162

158163
## LQR steer control
159164

160-
<img src="./img/lqr_steer_control.svg" width="640px">
165+
<img src="./img/lqr_steer_control.svg" width="640px">
161166

162-
Brack: Planned path, Green: Tracked path
167+
Brack: Planned path, Green: Tracked path
163168

164169
- [src](https://github.com/rsasaki0109/RustRobotics/blob/master/src/bin/lqr_steer_control.rs)
165170

img/bezier_path.svg

Lines changed: 2 additions & 2 deletions
Loading

0 commit comments

Comments
 (0)