YAML Trainer data: iterate through nodes rather than assuming their presence (#1350)

Resolves #1349
2022-01-07 10:32:00 +10:00
parent d97afb6f8e
commit eb90b4a68d
1 changed files with 2 additions and 13 deletions
@@ -61,19 +61,8 @@ Node convert<TrainerData>::encode(const TrainerData& rhs)

 bool convert<TrainerData>::decode(const Node& node, TrainerData& rhs)
 {
-  if (node["calib"]) {
-    const Node& calib = node["calib"];
-    for (int i = 0; i < 4; i++) {
-      calib[std::to_string(i)]["val"] >> rhs.calib[i];
-    }
-  }
-
-  if (node["mix"]) {
-    const Node& mix = node["mix"];
-    for (int i = 0; i < 4; i++) {
-      mix[std::to_string(i)] >> rhs.mix[i];
-    }
-  }
+  node["calib"] >> rhs.calib;
+  node["mix"] >> rhs.mix;
  return true;
 }