Parse parameters from reader instead of string and get_id()

Cargo.toml

@@ -14,7 +14,6 @@ rand = "0.8.5"
 csv = "1.3"
 serde = { version = "1.0", features = ["derive"] }
 serde_derive = "1.0"
-toml = "0.8.19"
 serde_json = "1.0.128"
 
 [dev-dependencies]

examples/parameter-loading/incidence_report.rs

@@ -26,7 +26,7 @@ fn handle_infection_status_change(
 ) {
  context.send_report(IncidenceReportItem {
  time: context.get_current_time(),
- person_id: event.person_id.id,
+ person_id: event.person_id.get_id(),
  infection_status: event.current,
  });
 }

src/global_properties.rs

@@ -5,6 +5,7 @@ use std::collections::HashMap;
 use std::fmt::{self, Debug, Display};
 use std::fs;
 use std::io;
+use std::io::BufReader;
 use std::path::Path;
 
 /// Defines a global property with the following parameters:
@@ -136,8 +137,9 @@ impl ContextGlobalPropertiesExt for Context {
  &mut self,
  file_name: &Path,
  ) -> Result<T, IxaError> {
- let config_file = fs::read_to_string(file_name)?;
- let config = serde_json::from_str(&config_file)?;
+ let config_file = fs::File::open(file_name)?;
+ let reader = BufReader::new(config_file);
+ let config = serde_json::from_reader(reader)?;
  Ok(config)
  }
 }

src/people.rs

@@ -28,7 +28,7 @@ define_data_plugin!(
 // 0 to population - 1 in the PeopleData container.
 #[derive(Clone, Copy, Hash, PartialEq, Eq, Serialize, Deserialize)]
 pub struct PersonId {
- pub id: usize,
+ id: usize,
 }
 
 impl fmt::Debug for PersonId {
@@ -37,6 +37,12 @@ impl fmt::Debug for PersonId {
  }
 }
 
+impl PersonId {
+ #[must_use]
+ pub fn get_id(&self) -> usize {
+ self.id
+ }
+}
 // Individual characteristics or states related to a person, such as age or
 // disease status, are represented as "person properties". These properties
 // * are represented by a struct type that implements the PersonProperty trait,