Reformating charting, add DataError message

2016-05-09 11:46:32 -04:00
parent 1ba8f24b10
commit aca7157663
11 changed files with 616 additions and 24 deletions
@@ -29,8 +29,16 @@ namespace LeafWeb.Core.Charter
 			foreach (var comparisonGroup in comparisonGroups)
 			{
 				if (comparisonGroup.FitType.Count() != 4)
-					throw new ArgumentException(
-						$"{comparisonGroup.CurveID} should have 4 data sets, only has {comparisonGroup.FitType.Count()}");
+				{
+					var missing =
+						from rwp in new[] {true, false}
+						from gamma in new [] {true, false}
+						where !comparisonGroup.FitType.Any(ft => ft.FitRwp == rwp && ft.FitGammaStar == gamma)
+						select $"(FitRwp: {(rwp ? "yes" : "no")}, FitGamma*: {(gamma ? "yes" : "no")})";
+					throw new ParseException(
+						$"Curve data in '{comparisonGroup.CurveID}' requires data sets representing all combinations of FitRwp and FitGamma."
+						+ " Combinations missing are: " + string.Join(", ", missing));
+				}

 				var curveData = new CurveData {CurveId = comparisonGroup.CurveID};