added semitrailer weights

VectoCore/VectoCore/Models/Declaration/Segments.cs

@@ -114,6 +114,13 @@ namespace TUGraz.VectoCore.Models.Declaration
 					? DeclarationData.StandardWeights.Lookup(row.Field<string>("trailer"))
 					: DeclarationData.StandardWeights.Empty;
 
+				var semiTrailerField = row.Field<string>("semitrailer");
+				var semiTrailer = !string.IsNullOrWhiteSpace(semiTrailerField)
+					? DeclarationData.StandardWeights.Lookup(semiTrailerField)
+					: DeclarationData.StandardWeights.Empty;
+
+				trailer += semiTrailer;
+
 				// limit gvw to MaxGVW (40t)
 				var gvw = VectoMath.Min(grossVehicleWeight + trailer.GrossVehicleWeight,
 					Constants.SimulationSettings.MaximumGrossVehicleWeight);

VectoCore/VectoCore/Models/Declaration/StandardWeights.cs

@@ -29,6 +29,7 @@
 *   Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
 */
 
+using System.CodeDom;
 using System.Collections.Generic;
 using System.Data;
 using System.Linq;
@@ -49,6 +50,15 @@ namespace TUGraz.VectoCore.Models.Declaration
 		}
 
 		public SquareMeter DeltaCrossWindArea;
+
+		public static StandardWeight operator +(StandardWeight first, StandardWeight second)
+		{
+			return new StandardWeight {
+				CurbWeight = first.CurbWeight + second.CurbWeight,
+				DeltaCrossWindArea = first.DeltaCrossWindArea + second.DeltaCrossWindArea,
+				GrossVehicleWeight = first.GrossVehicleWeight + second.GrossVehicleWeight
+			};
+		}
 	}
 
 	/// <summary>