ajinkya/pathfinder2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Support binary database in cli.

Browse source
This commit is contained in:
chriseth 2022-12-20 21:08:39 +01:00
parent 88ea58d25e
commit 32bc0786a8
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/bin/cli.rs
View file

@ -30,14 +30,27 @@ fn main() {
} else { } else {
false false
}; };
let safes = if args.get(1) == Some(&"--safes".to_string()) {
args = [vec![args[0].clone()], args[2..].to_vec()].concat();
true
} else {
false
};
if safes && csv {
println!("Options --safes and --csv cannot be used together.");
return;
}
if args.len() < 4 { if args.len() < 4 {
println!("Usage: cli [--csv] <from> <to> <edges.dat> [--dot <dotfile>]"); println!("Usage: cli [--csv] [--safes] <from> <to> <edges.dat> [--dot <dotfile>]");
println!("Usage: cli [--csv] <from> <to> <edges.dat> <max_hops> [--dot <dotfile>]");
println!( println!(
"Usage: cli [--csv] <from> <to> <edges.dat> <max_hops> <max_flow> [--dot <dotfile>]" "Usage: cli [--csv] [--safes] <from> <to> <edges.dat> <max_hops> [--dot <dotfile>]"
);
println!(
"Usage: cli [--csv] [--safes] <from> <to> <edges.dat> <max_hops> <max_flow> [--dot <dotfile>]"
); );
println!("Option --csv reads edges.dat in csv format instead of binary."); println!("Option --csv reads edges.dat in csv format instead of binary.");
println!("Option --safes reads a safes.dat file instead of an edges.dat file.");
return; return;
} }
let mut max_hops = None; let mut max_hops = None;
@ -57,10 +70,12 @@ fn main() {
println!("Computing flow {from_str} -> {to_str} using {edges_file}"); println!("Computing flow {from_str} -> {to_str} using {edges_file}");
let edges = (if csv { let edges = (if csv {
io::read_edges_csv(edges_file) io::read_edges_csv(edges_file)
} else if safes {
io::import_from_safes_binary(edges_file).map(|db| db.edges().clone())
} else { } else {
io::read_edges_binary(edges_file) io::read_edges_binary(edges_file)
}) })
.unwrap_or_else(|_| panic!("Error loading edges from file \"{edges_file}\".")); .unwrap_or_else(|_| panic!("Error loading edges/safes from file \"{edges_file}\"."));
println!("Read {} edges", edges.edge_count()); println!("Read {} edges", edges.edge_count());
let (flow, transfers) = graph::compute_flow( let (flow, transfers) = graph::compute_flow(
&Address::from(from_str.as_str()), &Address::from(from_str.as_str()),