Minor cleanup

Author: easbar

README.md

@@ -117,14 +117,14 @@ For this to work `another_input_graph` must have the same number of nodes as `in
 |California&Nevada|1.890.816|4.630.444|
 |USA|23.947.348|57.708.624|
 
-|graph|metric|preparation time|average query time (micros)|
+|graph|metric|preparation time|average query time|
 |-|-|-|-|
-|NY city|distance|15 s|108|
-|CAL&NV|distance|70 s|243|
-|USA|distance|21 min|1452|
-|NY city|time|10 s|54|
-|CAL&NV|time|50 s|149|
-|USA|time|11 min|856|
+|NY city|distance|15 s|108 μs|
+|CAL&NV|distance|70 s|243 μs|
+|USA|distance|21 min|1452 μs|
+|NY city|time|10 s|54 μs|
+|CAL&NV|time|50 s|149 μs|
+|USA|time|11 min|856 μs|
 
 The shortest path calculation time was averaged over 100k random routing queries. The benchmarks were run using Rust 1.50.0
 

src/lib.rs

@@ -452,32 +452,51 @@ mod tests {
     #[test]
     fn run_performance_test_dist_fixed_ordering() {
         println!("Running performance test for Bremen dist (fixed node ordering)");
-        let input_graph = InputGraph::from_file("meta/test_maps/bremen_dist.gr");
-        let mut fast_graph = prepare(&input_graph);
-        let order = get_node_ordering(&fast_graph);
+        run_performance_test_fixed_ordering(
+            &InputGraph::from_file("meta/test_maps/bremen_dist.gr"),
+            &Params::default(),
+            845493338,
+            30265,
+        );
+    }
+
+    fn run_performance_test(
+        input_graph: &InputGraph,
+        params: &Params,
+        expected_checksum: usize,
+        expected_num_not_found: usize,
+    ) {
+        let mut fast_graph = FastGraph::new(1);
         prepare_algo(
-            &mut |input_graph| fast_graph = prepare_with_order(input_graph, &order).unwrap(),
+            &mut |input_graph| fast_graph = prepare_with_params(input_graph, params),
             &input_graph,
         );
         print_fast_graph_stats(&fast_graph);
         let mut path_calculator = PathCalculator::new(fast_graph.get_num_nodes());
         do_run_performance_test(
             &mut |s, t| path_calculator.calc_path(&fast_graph, s, t),
             input_graph.get_num_nodes(),
-            845493338,
-            30265,
+            expected_checksum,
+            expected_num_not_found,
         );
     }
 
-    fn run_performance_test(
+    fn run_performance_test_fixed_ordering(
         input_graph: &InputGraph,
         params: &Params,
         expected_checksum: usize,
         expected_num_not_found: usize,
     ) {
-        let mut fast_graph = FastGraph::new(1);
+        let mut time = Stopwatch::start_new();
+        let mut fast_graph = prepare_with_params(input_graph, params);
+        time.stop();
+        println!(
+            "preparation time (heuristic order). {} ms",
+            time.elapsed_ms()
+        );
+        let order = get_node_ordering(&fast_graph);
         prepare_algo(
-            &mut |input_graph| fast_graph = prepare_with_params(input_graph, params),
+            &mut |input_graph| fast_graph = prepare_with_order(input_graph, &order).unwrap(),
             &input_graph,
         );
         print_fast_graph_stats(&fast_graph);