Corrected multimlp

neural_network/src/MultiMLP.cpp

@@ -90,24 +90,20 @@ std::vector<float> MultiMLP::predict(FeatureModel::FeatureDescription & fd)
 
 float MultiMLP::update(FeatureModel::FeatureDescription & fd, int gold)
 {
-  try
-  {
+  float loss = 0.0;
   for (auto & mlp : mlps)
+    try
     {
       int id = std::stoi(split(mlp.name, '_')[1]);
-      float loss = 0.0;
       mlp.setBatchSize(getBatchSize());
-      loss = mlp.update(fd, id == gold ? 1 : 0);
+      loss += mlp.update(fd, id == gold ? 1 : 0);
 
       trainer->update();
-      return loss;
-    }
     } catch (BatchNotFull &)
     {
-    return 0.0;
     }
 
-  return 0.0;
+  return loss;
 }
 
 float MultiMLP::update(FeatureModel::FeatureDescription &, const std::vector<float> &)
@@ -120,19 +116,14 @@ float MultiMLP::update(FeatureModel::FeatureDescription &, const std::vector<flo
 float MultiMLP::getLoss(FeatureModel::FeatureDescription & fd, int gold)
 {
   float loss = 0.0;
-  try
-  {
   for (auto & mlp : mlps)
+    try
     {
       int id = std::stoi(split(mlp.name, '_')[1]);
       mlp.setBatchSize(getBatchSize());
       loss += mlp.getLoss(fd, id == gold ? 1 : 0);
-
-      trainer->update();
-    }
     } catch (BatchNotFull &)
     {
-    return 0.0;
     }
 
   return loss;