fix

Author: connortsui20

week12/rowlab/src/aggregation.rs

@@ -40,7 +40,7 @@ impl StationAggregation {
     }
 
     /// Updates the aggregation with a new measurement.
-    /// 
+    ///
     /// TODO(student): Is processing measurements one-by-one the best way to compute aggregations?
     /// Remember that you are allowed to add other methods in this implementation block!
     pub fn add_measurement(&mut self, measurement: f64) {
@@ -62,7 +62,7 @@ impl StationAggregation {
 /// might best be located.
 #[derive(Debug)]
 pub struct AggregationResults {
-    pub(crate) results: HashMap<String, StationAggregation>,
+    results: HashMap<String, StationAggregation>,
 }
 
 impl AggregationResults {
@@ -76,6 +76,20 @@ impl AggregationResults {
         }
     }
 
+    // Updates the metrics for the given station with a measurement.
+    pub fn insert_measurement(&mut self, station: &str, measurement: f64) {
+        // We don't use the `entry` API in the `Some` case since it would require us to always turn
+        // `station` into an owned `String`, since `.entry()` requires an owned type.
+        match self.results.get_mut(station) {
+            Some(val) => val.add_measurement(measurement),
+            None => self
+                .results
+                .entry(station.to_string())
+                .or_default()
+                .add_measurement(measurement),
+        }
+    }
+
     /// Converts the aggregations results into a [`String`].
     ///
     /// TODO(student): Is this function efficient? Is there another way you could do this? Note that

week12/rowlab/src/lib.rs

@@ -20,7 +20,7 @@ pub fn aggregate(measurements_path: impl AsRef<Path>) -> AggregationResults {
     let measurements = File::open(measurements_path).expect("unable to read measurements");
     let buf_reader = std::io::BufReader::new(measurements);
 
-    let mut aggr = AggregationResults::new();
+    let mut results = AggregationResults::new();
 
     for line_res in buf_reader.lines() {
         let line = line_res.expect("Was unable to read the line");
@@ -33,17 +33,8 @@ pub fn aggregate(measurements_path: impl AsRef<Path>) -> AggregationResults {
             .parse::<f64>()
             .expect("unable to parse temperature");
 
-        // We don't use the `entry` API in the `Some` case since it would require us to always turn
-        // `station` into an owned `String`, since `.entry()` requires an owned type.
-        match aggr.results.get_mut(station) {
-            Some(val) => val.add_measurement(parsed_temperature),
-            None => aggr
-                .results
-                .entry(station.to_string())
-                .or_default()
-                .add_measurement(parsed_temperature),
-        }
+        results.insert_measurement(station, parsed_temperature);
     }
 
-    aggr
+    results
 }

week12/rowlab_ref/Cargo.toml

@@ -10,4 +10,5 @@ indicatif = "0.17.11"
 itertools = "0.14.0"
 rand = "0.9.0"
 rand_distr = "0.5.1"
+rayon = "1.10.0"
 regex = "1.11.1"

week12/rowlab_ref/src/aggregation.rs

@@ -40,7 +40,7 @@ impl StationAggregation {
     }
 
     /// Updates the aggregation with a new measurement.
-    /// 
+    ///
     /// TODO(student): Is processing measurements one-by-one the best way to compute aggregations?
     /// Remember that you are allowed to add other methods in this implementation block!
     pub fn add_measurement(&mut self, measurement: f64) {
@@ -62,7 +62,7 @@ impl StationAggregation {
 /// might best be located.
 #[derive(Debug)]
 pub struct AggregationResults {
-    pub(crate) results: HashMap<String, StationAggregation>,
+    results: HashMap<String, StationAggregation>,
 }
 
 impl AggregationResults {
@@ -76,6 +76,20 @@ impl AggregationResults {
         }
     }
 
+    // Updates the metrics for the given station with a measurement.
+    pub fn insert_measurement(&mut self, station: &str, measurement: f64) {
+        // We don't use the `entry` API in the `Some` case since it would require us to always turn
+        // `station` into an owned `String`, since `.entry()` requires an owned type.
+        match self.results.get_mut(station) {
+            Some(val) => val.add_measurement(measurement),
+            None => self
+                .results
+                .entry(station.to_string())
+                .or_default()
+                .add_measurement(measurement),
+        }
+    }
+
     /// Converts the aggregations results into a [`String`].
     ///
     /// TODO(student): Is this function efficient? Is there another way you could do this? Note that

week12/rowlab_ref/src/lib.rs

@@ -20,7 +20,7 @@ pub fn aggregate(measurements_path: impl AsRef<Path>) -> AggregationResults {
     let measurements = File::open(measurements_path).expect("unable to read measurements");
     let buf_reader = std::io::BufReader::new(measurements);
 
-    let mut aggr = AggregationResults::new();
+    let mut results = AggregationResults::new();
 
     for line_res in buf_reader.lines() {
         let line = line_res.expect("Was unable to read the line");
@@ -33,17 +33,8 @@ pub fn aggregate(measurements_path: impl AsRef<Path>) -> AggregationResults {
             .parse::<f64>()
             .expect("unable to parse temperature");
 
-        // We don't use the `entry` API in the `Some` case since it would require us to always turn
-        // `station` into an owned `String`, since `.entry()` requires an owned type.
-        match aggr.results.get_mut(station) {
-            Some(val) => val.add_measurement(parsed_temperature),
-            None => aggr
-                .results
-                .entry(station.to_string())
-                .or_default()
-                .add_measurement(parsed_temperature),
-        }
+        results.insert_measurement(station, parsed_temperature);
     }
 
-    aggr
+    results
 }