Skip to content

Commit 0f089e6

Browse files
committed
Store model path in Model struct
1 parent 4117bc4 commit 0f089e6

2 files changed

Lines changed: 8 additions & 1 deletion

File tree

src/input.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,12 @@ pub fn load_model<P: AsRef<Path>>(model_dir: P) -> Result<(Model, AssetPool)> {
196196
let agent_ids = agents.keys().cloned().collect();
197197
let assets = read_assets(model_dir.as_ref(), &agent_ids, &processes, &region_ids)?;
198198

199+
let model_path = model_dir
200+
.as_ref()
201+
.canonicalize()
202+
.context("Could not parse path to model")?;
199203
let model = Model {
204+
model_path,
200205
milestone_years: model_file.milestone_years.years,
201206
agents,
202207
commodities,

src/model.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,14 @@ use crate::region::{RegionID, RegionMap};
77
use crate::time_slice::TimeSliceInfo;
88
use anyhow::{ensure, Context, Result};
99
use serde::Deserialize;
10-
use std::path::Path;
10+
use std::path::{Path, PathBuf};
1111

1212
const MODEL_FILE_NAME: &str = "model.toml";
1313

1414
/// Model definition
1515
pub struct Model {
16+
/// Path to model folder
17+
pub model_path: PathBuf,
1618
/// Milestone years for the simulation. Sorted.
1719
pub milestone_years: Vec<u32>,
1820
/// Agents for the simulation

0 commit comments

Comments
 (0)