fix: Make some schema fields public.

pywr-schema/src/data_tables/mod.rs

@@ -58,11 +58,11 @@ pub enum CsvDataTableLookup {
 /// An external table of data that can be referenced
 #[derive(serde::Deserialize, serde::Serialize, Debug, Clone)]
 pub struct CsvDataTable {
-    name: String,
+    pub name: String,
     #[serde(rename = "type")]
-    ty: DataTableType,
-    lookup: CsvDataTableLookup,
-    url: PathBuf,
+    pub ty: DataTableType,
+    pub lookup: CsvDataTableLookup,
+    pub url: PathBuf,
 }
 
 impl CsvDataTable {
@@ -226,9 +226,9 @@ impl LoadedTableCollection {
 
 #[derive(serde::Deserialize, serde::Serialize, Debug, Clone)]
 pub struct TableDataRef {
-    table: String,
-    column: Option<TableIndex>,
-    index: Option<TableIndex>,
+    pub table: String,
+    pub column: Option<TableIndex>,
+    pub index: Option<TableIndex>,
 }
 
 impl TableDataRef {

pywr-schema/src/metric_sets/mod.rs

@@ -109,11 +109,11 @@ impl From<MetricAggFrequency> for pywr_core::recorders::AggregationFrequency {
 #[derive(Deserialize, Serialize, Clone)]
 pub struct MetricAggregator {
     /// Optional aggregation frequency.
-    freq: Option<MetricAggFrequency>,
+    pub freq: Option<MetricAggFrequency>,
     /// Aggregation function to apply over metric values.
-    func: MetricAggFunc,
+    pub func: MetricAggFunc,
     /// Optional child aggregator.
-    child: Option<Box<MetricAggregator>>,
+    pub child: Option<Box<MetricAggregator>>,
 }
 
 impl From<MetricAggregator> for pywr_core::recorders::Aggregator {
@@ -133,9 +133,9 @@ impl From<MetricAggregator> for pywr_core::recorders::Aggregator {
 /// in multiple values (i.e. per each period implied by the frequency).
 #[derive(Deserialize, Serialize, Clone)]
 pub struct MetricSet {
-    name: String,
-    metrics: Vec<OutputMetric>,
-    aggregator: Option<MetricAggregator>,
+    pub name: String,
+    pub metrics: Vec<OutputMetric>,
+    pub aggregator: Option<MetricAggregator>,
 }
 
 impl MetricSet {

pywr-schema/src/outputs/hdf.rs

@@ -4,10 +4,10 @@ use std::path::{Path, PathBuf};
 
 #[derive(serde::Deserialize, serde::Serialize, Debug, Clone)]
 pub struct Hdf5Output {
-    name: String,
-    filename: PathBuf,
+    pub name: String,
+    pub filename: PathBuf,
     /// The metric set to save
-    metric_set: String,
+    pub metric_set: String,
 }
 
 impl Hdf5Output {

pywr-schema/src/outputs/memory.rs

@@ -4,9 +4,9 @@ use pywr_core::recorders::MemoryRecorder;
 
 #[derive(serde::Deserialize, serde::Serialize, Debug, Clone)]
 pub struct MemoryAggregation {
-    time: Option<MetricAggFunc>,
-    scenario: Option<MetricAggFunc>,
-    metric: Option<MetricAggFunc>,
+    pub time: Option<MetricAggFunc>,
+    pub scenario: Option<MetricAggFunc>,
+    pub metric: Option<MetricAggFunc>,
 }
 
 impl From<MemoryAggregation> for pywr_core::recorders::Aggregation {
@@ -21,9 +21,9 @@ impl From<MemoryAggregation> for pywr_core::recorders::Aggregation {
 
 #[derive(serde::Deserialize, serde::Serialize, Debug, Clone)]
 pub struct MemoryOutput {
-    name: String,
-    metric_set: String,
-    aggregation: MemoryAggregation,
+    pub name: String,
+    pub metric_set: String,
+    pub aggregation: MemoryAggregation,
 }
 
 impl MemoryOutput {