Merge pull request #828 in VECTO/vecto-sim from...

Merge pull request #828 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-1259-mission-profile-weightinf-factors-for-vehicles-of-group-16-are-not-correct to develop

* commit 'd8f54cc2':
  update mission profile weighting factors for vehicles of group 16
  adding additional check that the weighting factors of all simulated cycles have to sum up to 1!

VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs

@@ -38,6 +38,7 @@ using System.Text;
 using System.Xml;
 using System.Xml.Linq;
 using System.Xml.XPath;
+using TUGraz.VectoCommon.Exceptions;
 using TUGraz.VectoCommon.InputData;
 using TUGraz.VectoCommon.Models;
 using TUGraz.VectoCommon.Resources;
@@ -198,6 +199,10 @@ namespace TUGraz.VectoCore.OutputData.XML
 
 		protected internal override void DoWriteReport()
 		{
+			var sumWeightinFactors = Missions.Values.Sum(x => x.ResultEntry.Values.Sum(y => y.WeightingFactor));
+			if (!sumWeightinFactors.IsEqual(0) || !sumWeightinFactors.IsEqual(1)) {
+				throw new VectoException("Mission Profile Weighting factors do not sum up to 1!");
+			}
 			foreach (var result in Missions.OrderBy(m => m.Key)) {
 				_manufacturerReport.WriteResult(result.Value);
 				_customerReport.WriteResult(result.Value);

VectoCore/VectoCore/Resources/Declaration/CO2Standards/MissionProfileWeights.csv

@@ -13,4 +13,4 @@ Weighting Group , LongHaul  , LongHaul EMS , Regional Delivery , Regional Delive
 10-LH           , 0.27/0.63 , 0/0          , 0.03/0.07         , 0/0                   , 0/0            , 0/0               , 0/0
 11              , 0/0       , 0/0          , 0.15/0.35         , 0/0                   , 0/0            , 0/0               , 0.15/0.35
 12              , 0/0       , 0/0          , 0.21/0.49         , 0/0                   , 0/0            , 0/0               , 0.09/0.21
-16              , 0/0       , 0/0          , 0.15/0.35         , 0/0                   , 0/0            , 0/0               , 0.15/0.35
+16              , 0/0       , 0/0          , 0/0               , 0/0                   , 0/0            , 0/0               , 0.30/0.70