rust refactoring

Author: pankdm

results-rust.txt

@@ -1,18 +1,18 @@
 {"map": "randomMedium.txt", "edges": 187, "graph_hash": "10172", "time": "0.275", "nodes": 97, "name": "rust"}
-{"map": "tube.txt", "edges": 386, "graph_hash": "77694", "time": "1.988", "nodes": 301, "name": "rust"}
-{"map": "sample.txt", "edges": 12, "graph_hash": "52", "time": "0.022", "nodes": 8, "name": "rust"}
-{"map": "vancouver.txt", "edges": 3601, "graph_hash": "3987248", "time": "117.323", "nodes": 1986, "name": "rust"}
-{"map": "lambda.txt", "edges": 60, "graph_hash": "2454", "time": "0.057", "nodes": 38, "name": "rust"}
-{"map": "boston-sparse.txt", "edges": 945, "graph_hash": "310052", "time": "6.015", "nodes": 488, "name": "rust"}
-{"map": "edinburgh-sparse.txt", "edges": 1751, "graph_hash": "865590", "time": "27.052", "nodes": 961, "name": "rust"}
-{"map": "oxford2-sparse-2.txt", "edges": 3632, "graph_hash": "5686142", "time": "153.934", "nodes": 2389, "name": "rust"}
-{"map": "oxford-center-sparse.txt", "edges": 2020, "graph_hash": "4190664", "time": "55.919", "nodes": 1425, "name": "rust"}
-{"map": "oxford-10000.txt", "edges": 10000, "graph_hash": "14165324", "time": "1424.255", "nodes": 6658, "name": "rust"}
-{"map": "icfp-coauthors-pj.txt", "edges": 3425, "graph_hash": "54594", "time": "23.479", "nodes": 892, "name": "rust"}
-{"map": "van-city-sparse.txt", "edges": 3601, "graph_hash": "3987248", "time": "115.222", "nodes": 1986, "name": "rust"}
-{"map": "randomSparse.txt", "edges": 123, "graph_hash": "20844", "time": "0.177", "nodes": 86, "name": "rust"}
-{"map": "Sierpinski-triangle.txt", "edges": 81, "graph_hash": "2232", "time": "0.068", "nodes": 42, "name": "rust"}
-{"map": "nara-sparse.txt", "edges": 2197, "graph_hash": "2541640", "time": "65.781", "nodes": 1560, "name": "rust"}
-{"map": "gothenburg-sparse.txt", "edges": 2234, "graph_hash": "982450", "time": "39.337", "nodes": 1175, "name": "rust"}
-{"map": "edinburgh-10000.txt", "edges": 10000, "graph_hash": "25273694", "time": "1530.794", "nodes": 7357, "name": "rust"}
-{"map": "circle.txt", "edges": 65, "graph_hash": "278", "time": "0.037", "nodes": 27, "name": "rust"}
+{"map": "tube.txt", "edges": 386, "graph_hash": "77694", "time": "2.05", "nodes": 301, "name": "rust"}
+{"map": "sample.txt", "edges": 12, "graph_hash": "52", "time": "0.023", "nodes": 8, "name": "rust"}
+{"map": "vancouver.txt", "edges": 3601, "graph_hash": "3987248", "time": "116.834", "nodes": 1986, "name": "rust"}
+{"map": "lambda.txt", "edges": 60, "graph_hash": "2454", "time": "0.056", "nodes": 38, "name": "rust"}
+{"map": "boston-sparse.txt", "edges": 945, "graph_hash": "310052", "time": "5.915", "nodes": 488, "name": "rust"}
+{"map": "edinburgh-sparse.txt", "edges": 1751, "graph_hash": "865590", "time": "26.167", "nodes": 961, "name": "rust"}
+{"map": "oxford2-sparse-2.txt", "edges": 3632, "graph_hash": "5686142", "time": "151.982", "nodes": 2389, "name": "rust"}
+{"map": "oxford-center-sparse.txt", "edges": 2020, "graph_hash": "4190664", "time": "54.448", "nodes": 1425, "name": "rust"}
+{"map": "oxford-10000.txt", "edges": 10000, "graph_hash": "14165324", "time": "1379.742", "nodes": 6658, "name": "rust"}
+{"map": "icfp-coauthors-pj.txt", "edges": 3425, "graph_hash": "54594", "time": "23.968", "nodes": 892, "name": "rust"}
+{"map": "van-city-sparse.txt", "edges": 3601, "graph_hash": "3987248", "time": "112.328", "nodes": 1986, "name": "rust"}
+{"map": "randomSparse.txt", "edges": 123, "graph_hash": "20844", "time": "0.178", "nodes": 86, "name": "rust"}
+{"map": "Sierpinski-triangle.txt", "edges": 81, "graph_hash": "2232", "time": "0.06", "nodes": 42, "name": "rust"}
+{"map": "nara-sparse.txt", "edges": 2197, "graph_hash": "2541640", "time": "67.388", "nodes": 1560, "name": "rust"}
+{"map": "gothenburg-sparse.txt", "edges": 2234, "graph_hash": "982450", "time": "48.34", "nodes": 1175, "name": "rust"}
+{"map": "edinburgh-10000.txt", "edges": 10000, "graph_hash": "25273694", "time": "1509.373", "nodes": 7357, "name": "rust"}
+{"map": "circle.txt", "edges": 65, "graph_hash": "278", "time": "0.036", "nodes": 27, "name": "rust"}

rust/src/main.rs

@@ -4,13 +4,13 @@ use std::str;
 use std::collections::VecDeque;
 use std::time::{Duration, Instant};
 
-type Graph = Vec<Vec<i32>>;
+type Graph = Vec<Vec<usize>>;
 
 #[derive(Debug)]
 struct Input {
     graph: Graph,
     mines: Vec<String>,
-    num_cities: i32,
+    num_cities: usize,
 }
 
 impl Input {
@@ -34,7 +34,7 @@ fn read_from_file(filename: &String) -> Input {
     let mut lines = text.lines();
     let num_cities: i32 = read_i32(&mut lines);
 
-    input.num_cities = num_cities;
+    input.num_cities = num_cities as usize;
     input.graph.resize(num_cities as usize, vec![]);
 
     let num_mines: i32 = read_i32(&mut lines);
@@ -49,31 +49,31 @@ fn read_from_file(filename: &String) -> Input {
     for _ in 0..num_edges {
         let edge: Vec<&str> = lines.next().unwrap().split(" ").collect();
         // println!("{:?}", edge);
-        let s: i32 = edge[0].parse().unwrap();
-        let t: i32 = edge[1].parse().unwrap();
-        input.graph[s as usize].push(t);
-        input.graph[t as usize].push(s);
+        let s: usize = edge[0].parse().unwrap();
+        let t: usize = edge[1].parse().unwrap();
+        input.graph[s].push(t);
+        input.graph[t].push(s);
     }
 
     input
 }
 
 const NOT_PROCESSED: i32 = -1;
 
-fn run_bfs(start: i32, input: &Input, scores: &mut Vec<i32>) {
-    scores.resize(input.num_cities as usize, NOT_PROCESSED);
-    scores[start as usize] = 0;
+fn run_bfs(start: usize, input: &Input, scores: &mut Vec<i32>) {
+    scores.resize(input.num_cities, NOT_PROCESSED);
+    scores[start] = 0;
 
-    let mut queue: VecDeque<i32> = VecDeque::new();
+    let mut queue: VecDeque<usize> = VecDeque::new();
     queue.push_back(start);
 
     while !queue.is_empty() {
         let now = queue.pop_front().unwrap();
-        let value = scores[now as usize];
+        let value = scores[now];
 
-        for next in input.graph[now as usize].iter() {
-            if scores[*next as usize] == NOT_PROCESSED {
-                scores[*next as usize] = value + 1;
+        for next in &input.graph[now] {
+            if scores[*next] == NOT_PROCESSED {
+                scores[*next] = value + 1;
                 queue.push_back(*next);
             }
         }
@@ -85,16 +85,18 @@ fn compute_hash(input: &Input) {
    let now = Instant::now();
 
     let mut distances: Vec<Vec<i32>> = vec![];
-    distances.resize(input.num_cities as usize, vec![]);
+    distances.resize(input.num_cities, vec![]);
 
     for i in 0..input.num_cities {
-        run_bfs(i, &input, &mut distances[i as usize]);
+        let node = i as usize;
+        run_bfs(node, &input, &mut distances[node]);
     }
 
     let mut total_score: i32 = 0;
     for i in 0..input.num_cities {
         let mut current_score: i32 = 0;
-        for d in distances[i as usize].iter() {
+        let node = i as usize;
+        for d in &distances[node] {
             if *d == NOT_PROCESSED {
                 continue;
             }