Compare commits

..

No commits in common. "ba5642063e5d58cfebfa0ac67f9d7b6947e0eb5c" and "bc2f900f37a045dc10bf5e0ac3b9f223c4075265" have entirely different histories.

6 changed files with 27 additions and 220 deletions

16
Cargo.lock generated
View File

@ -28,25 +28,9 @@ name = "dijkstras-algo-wu"
version = "0.1.0"
dependencies = [
"csv",
"itertools",
"serde",
]
[[package]]
name = "either"
version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
[[package]]
name = "itertools"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
dependencies = [
"either",
]
[[package]]
name = "itoa"
version = "1.0.11"

View File

@ -7,5 +7,4 @@ edition = "2021"
[dependencies]
csv = "1.3.0"
itertools = "0.12.1"
serde = { version = "1.0.198", features = ["derive"] }

View File

@ -2,9 +2,9 @@
pub(crate) struct Airport {
pub(crate) id: usize,
pub(crate) code: String,
pub(crate) _name: String,
pub(crate) _city: String,
pub(crate) _country: String,
pub(crate) name: String,
pub(crate) city: String,
pub(crate) country: String,
pub(crate) lat: f64,
pub(crate) lon: f64,
}

View File

@ -1,35 +0,0 @@
use std::{collections::HashMap, process::exit};
pub fn help() {
println!(
"usage:
airport-paths <aiport code> <airport code>
finds the shortest path between the first and second airport-paths
airport-paths -h
shows this help"
);
}
pub fn handle_args(args: Vec<String>, code_to_id: HashMap<String, usize>) -> (usize, usize) {
let (origin, destination) = match args.len() {
3 => {
let exit_handler = || {
println!("unable to find airport");
exit(2);
};
let origin = code_to_id.get(&args[1]).unwrap_or_else(exit_handler);
let destination = code_to_id.get(&args[2]).unwrap_or_else(exit_handler);
(origin, destination)
}
_ => {
help();
match args.get(1).map(String::as_str) {
Some("-h") => exit(0),
_ => exit(2),
}
}
};
(*origin, *destination)
}

View File

@ -1,19 +0,0 @@
use std::cmp::Ordering;
#[derive(Debug, Clone, PartialOrd)]
pub struct NonNan(pub f64);
impl Eq for NonNan {}
impl PartialEq for NonNan {
fn eq(&self, other: &Self) -> bool {
self.0 == other.0
}
}
#[allow(clippy::derive_ord_xor_partial_ord)]
impl Ord for NonNan {
fn cmp(&self, other: &NonNan) -> Ordering {
self.partial_cmp(other).unwrap()
}
}

View File

@ -1,53 +1,26 @@
#![allow(dead_code)]
mod airport;
mod cmd;
mod distance;
mod float_ordering;
mod parse;
use std::{
cell::RefCell,
collections::{hash_map::Entry, BTreeSet, HashMap},
env,
error::Error,
f64::INFINITY,
fs::File,
io::BufReader,
ops::Deref,
collections::{hash_map::Entry, HashMap},
rc::Rc,
};
use float_ordering::NonNan;
use itertools::Itertools;
use parse::Record;
type NodePointer = Rc<RefCell<Node>>;
type Graph = HashMap<usize, NodePointer>;
type Graph = HashMap<usize, Rc<RefCell<Node>>>;
type Airports = HashMap<usize, Rc<airport::Airport>>;
#[derive(Debug, Clone)]
struct Node {
origin: Rc<airport::Airport>,
destinations: Vec<Destination>,
source_distance: NonNan,
previous_node: Option<NodePointer>,
}
#[derive(Clone)]
struct PathFollower {
next_node: Option<NodePointer>,
}
impl Iterator for PathFollower {
type Item = NodePointer;
fn next(&mut self) -> Option<Self::Item> {
if let Some(node) = self.next_node.take() {
self.next_node = node.borrow().previous_node.clone();
return Some(node);
}
None
}
source_distance: f64,
visited: bool,
}
impl Node {
@ -55,50 +28,18 @@ impl Node {
Node {
destinations,
origin,
source_distance: NonNan(INFINITY),
previous_node: None,
source_distance: 0.0,
visited: false,
}
}
}
impl Eq for Node {}
impl PartialEq for Node {
fn eq(&self, other: &Self) -> bool {
other.origin.id == self.origin.id
}
}
impl Ord for Node {
fn cmp(&self, other: &Self) -> std::cmp::Ordering {
self.source_distance
.cmp(&other.source_distance)
.then_with(|| self.origin.id.cmp(&other.origin.id))
}
}
impl PartialOrd for Node {
fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
Some(self.cmp(other))
}
}
#[derive(Clone)]
#[derive(Debug, Clone)]
struct Destination {
node: NodePointer,
airport: Rc<RefCell<Node>>,
distance: f64,
}
impl std::fmt::Debug for Destination {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
let node = self.node.as_ref().borrow();
f.debug_struct("Node")
.field("origin", &node.origin)
.field("distance", &self.distance)
.finish()
}
}
impl Destination {
fn new(source: &airport::Airport, destination: Rc<airport::Airport>, graph: &Graph) -> Self {
Destination {
@ -106,7 +47,7 @@ impl Destination {
(source.lat, source.lon),
(destination.lat, destination.lon),
),
node: graph[&destination.id].clone(),
airport: graph[&destination.id].clone(),
}
}
}
@ -116,9 +57,9 @@ fn insert_airports_from_record(airports: &mut Airports, record: &Record) {
entry.insert(Rc::new(airport::Airport {
id: record.origin_airport_id,
code: record.origin_airport_code.clone(),
_name: record.origin_airport.clone(),
_city: record.origin_city.clone(),
_country: record.origin_country.clone(),
name: record.origin_airport.clone(),
city: record.origin_city.clone(),
country: record.origin_country.clone(),
lat: record.origin_airport_latitude,
lon: record.origin_airport_longitude,
}));
@ -128,29 +69,28 @@ fn insert_airports_from_record(airports: &mut Airports, record: &Record) {
entry.insert(Rc::new(airport::Airport {
id: record.destination_airport_id,
code: record.destination_airport_code.clone(),
_name: record.destination_airport.clone(),
_city: record.destination_city.clone(),
_country: record.destination_country.clone(),
name: record.destination_airport.clone(),
city: record.destination_city.clone(),
country: record.destination_country.clone(),
lat: record.destination_airport_latitude,
lon: record.destination_airport_longitude,
}));
}
}
fn main() -> Result<(), Box<dyn Error>> {
fn main() {
// Read all data lines in, ignoring errors
let data: Vec<Record> = csv::Reader::from_reader(BufReader::new(File::open("routes.csv")?))
let data: Vec<Record> = csv::Reader::from_reader(std::io::stdin())
.deserialize()
.flatten()
.collect();
// Storing airport data as a list of reference counted pointers
let mut airports: Airports = HashMap::new();
for record in &data {
insert_airports_from_record(&mut airports, record);
}
// Index for converting airport codes to airport ids
let code_to_id: HashMap<String, usize> = HashMap::from_iter(
airports
.iter()
@ -170,72 +110,10 @@ fn main() -> Result<(), Box<dyn Error>> {
// Populate Edges
for record in data {
let destination = record.get_destination(&airports, &graph);
if let Entry::Occupied(entry) = graph.entry(record.origin_airport_id) {
let mut node = entry.get().deref().borrow_mut();
node.destinations.push(destination);
if let Entry::Occupied(mut entry) = graph.entry(record.origin_airport_id) {
let mut entry = entry.get_mut().borrow_mut();
entry.destinations.push(destination);
};
}
// Using command line arguments as input
let args: Vec<String> = env::args().collect();
let (origin_id, destination_id) = cmd::handle_args(args, code_to_id);
// Fetch target nodes
let origin = graph[&origin_id].clone();
let destination = graph[&destination_id].clone();
origin.deref().borrow_mut().source_distance = NonNan(0.0);
#[allow(clippy::mutable_key_type)]
let mut unvisited: BTreeSet<NodePointer> = BTreeSet::new();
for node in graph.values() {
unvisited.insert(node.clone());
}
while let Some(current_node) = unvisited.pop_first() {
if current_node.borrow().deref() == destination.borrow().deref() {
break;
}
for target in &current_node.borrow().destinations {
let new_distance = current_node.borrow().source_distance.0 + target.distance;
if new_distance < target.node.borrow().source_distance.0 {
let destination_node = unvisited.take(&target.node).unwrap();
{
let mut node_ref = destination_node.deref().borrow_mut();
node_ref.previous_node = Some(current_node.clone());
node_ref.source_distance = NonNan(new_distance);
}
unvisited.insert(destination_node);
}
}
}
let follower = PathFollower {
next_node: Some(destination.clone()),
};
let reversed_path: Vec<NodePointer> = follower.collect();
let path: Vec<NodePointer> = reversed_path.into_iter().rev().collect();
if path.len() > 1 {
println!(
"Total Distance: {}",
path[path.len() - 1].borrow().source_distance.0
);
println!(
"{}",
path.iter()
.map(|node| node.borrow().origin.code.clone())
.join("->")
);
} else {
println!("Path Not Found")
}
Ok(())
}