GH-75 - AgeDistribution: Poor error message for Array of Arrays (#76)

EMOD-Hub · Dec 20, 2024 · 462b6ec · 462b6ec
1 parent 413e13e
commit 462b6ec
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Eradication/NodeDemographics.cpp b/Eradication/NodeDemographics.cpp
@@ -1350,18 +1350,18 @@ void NodeDemographicsDistribution::CheckIsArrayOfValues( const std::string& rDis
         std::stringstream ss;
         ss << "\nERROR:  Unexpected type while parsing '" << parameterName << "'\n";
         ss << "in distribution '" << rDistributionName << "' for nodeID = " << nodeId << ".\n";
-        ss << "Expected an array of floats but detected ";
+        ss << "Expected an array of floats but detected an array of ";
         if( rArray[ zero ].IsArray() )
         {
-            ss << " an array.";
+            ss << "arrays.";
         }
         else if( rArray[ zero ].IsObject() )
         {
-            ss << " an object/dictionary.";
+            ss << "objects/dictionaries.";
         }
         else
         {
-            ss << " unknown";
+            ss << "unknown";
         }
         throw NodeDemographicsFormatErrorException( __FILE__, __LINE__, __FUNCTION__, ss.str().c_str() );
     }

diff --git a/componentTests/NodeDemographicsTest.cpp b/componentTests/NodeDemographicsTest.cpp
@@ -625,7 +625,7 @@ SUITE(NodeDemographicsTest)
     {
         std::vector<std::string> axis_names ;
         TestHelper_DistributionFormatException( __LINE__, "demographics_TestDistAgeDisttNumResultValuesNotMatchDistValuesC_DoubleArray.json", "AgeDistribution", axis_names,
-                                                "ERROR:  Unexpected type while parsing 'ResultValues'\nin distribution 'AgeDistribution' for nodeID = 1.\nExpected an array of floats but detected  an array.)" );
+                                                "ERROR:  Unexpected type while parsing 'ResultValues'\nin distribution 'AgeDistribution' for nodeID = 1.\nExpected an array of floats but detected an array of arrays.)" );
     }
 
     TEST_FIXTURE(NodeDemographicsFactoryFixture, TestDistFertDistInvalidNumAxisNames)