|
|
@ -109,8 +109,7 @@ fn main() -> Result<(), error::Error> { |
|
|
|
.long("graph") |
|
|
|
.long("graph") |
|
|
|
.help("Output graph of internal state") |
|
|
|
.help("Output graph of internal state") |
|
|
|
.takes_value(false) |
|
|
|
.takes_value(false) |
|
|
|
.multiple(false) |
|
|
|
.multiple(false), |
|
|
|
.conflicts_with("test"), |
|
|
|
|
|
|
|
) |
|
|
|
) |
|
|
|
.arg( |
|
|
|
.arg( |
|
|
|
Arg::with_name("test") |
|
|
|
Arg::with_name("test") |
|
|
@ -177,7 +176,7 @@ fn main() -> Result<(), error::Error> { |
|
|
|
let test = matches.is_present("test"); |
|
|
|
let test = matches.is_present("test"); |
|
|
|
|
|
|
|
|
|
|
|
let output_folder = if test { |
|
|
|
let output_folder = if test { |
|
|
|
"" |
|
|
|
"." |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
matches.value_of("OUTPUT_DIR").unwrap() |
|
|
|
matches.value_of("OUTPUT_DIR").unwrap() |
|
|
|
}; |
|
|
|
}; |
|
|
@ -272,10 +271,6 @@ fn main() -> Result<(), error::Error> { |
|
|
|
println!("\n{:?}", tree); |
|
|
|
println!("\n{:?}", tree); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if test { |
|
|
|
|
|
|
|
return Ok(()); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Print graph
|
|
|
|
// Print graph
|
|
|
|
if graph { |
|
|
|
if graph { |
|
|
|
let mut gv_file = fs::File::create(format! {"{}/state.gv",output_folder})?; |
|
|
|
let mut gv_file = fs::File::create(format! {"{}/state.gv",output_folder})?; |
|
|
@ -304,6 +299,10 @@ fn main() -> Result<(), error::Error> { |
|
|
|
writeln!(gv_file, "}}")?; |
|
|
|
writeln!(gv_file, "}}")?; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if test { |
|
|
|
|
|
|
|
return Ok(()); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
let min_x: i64 = min_x.unwrap(); |
|
|
|
let min_x: i64 = min_x.unwrap(); |
|
|
|
let max_x: i64 = max_x.unwrap(); |
|
|
|
let max_x: i64 = max_x.unwrap(); |
|
|
|
let min_y: i64 = min_y.unwrap(); |
|
|
|
let min_y: i64 = min_y.unwrap(); |
|
|
|