From 7b33faac957f52b1a60594a0d6c9e4bb291e847b Mon Sep 17 00:00:00 2001
From: "VKMTHD\\haraldmartini" <harald.martini@student.tugraz.at>
Date: Mon, 19 Sep 2022 11:28:17 +0200
Subject: [PATCH] updated test files for PEV_e2, PEV_E3 heavy lorry

---
 .../HeavyLorry/HeavyLorrySimulation.cs        |   2 +-
 .../PEV_heavyLorry_AMT_E2_realistic.xml       |  45 +++-
 .../PEV_heavyLorry_E3_realistic.xml           | 221 +++++++++++++++---
 3 files changed, 226 insertions(+), 42 deletions(-)

diff --git a/VectoCore/VectoCoreTest/Integration/Declaration/HeavyLorry/HeavyLorrySimulation.cs b/VectoCore/VectoCoreTest/Integration/Declaration/HeavyLorry/HeavyLorrySimulation.cs
index 7b0c8a1380..4ae8d64a6e 100644
--- a/VectoCore/VectoCoreTest/Integration/Declaration/HeavyLorry/HeavyLorrySimulation.cs
+++ b/VectoCore/VectoCoreTest/Integration/Declaration/HeavyLorry/HeavyLorrySimulation.cs
@@ -44,7 +44,7 @@ public class HeavyLorrySimulation
 		var jobContainer = new JobContainer(new MockSumWriter()) { };
 		jobContainer.AddRuns(runsFactory);
 		PrintRuns(jobContainer);
-		jobContainer.Execute(true);
+		jobContainer.Execute(false);
 		jobContainer.WaitFinished();
 		PrintRuns(jobContainer);
 
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/V24_DeclarationMode/HeavyLorry/PEV_heavyLorry_AMT_E2_realistic.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/V24_DeclarationMode/HeavyLorry/PEV_heavyLorry_AMT_E2_realistic.xml
index 6237983727..d7b1e1f99d 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/V24_DeclarationMode/HeavyLorry/PEV_heavyLorry_AMT_E2_realistic.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/V24_DeclarationMode/HeavyLorry/PEV_heavyLorry_AMT_E2_realistic.xml
@@ -40,7 +40,7 @@
 		<Components xsi:type="Components_PEV-E2_LorryType">
 			<ElectricMachine>
 				<PowertrainPosition>2</PowertrainPosition>
-				<Count>1</Count>
+				<Count>2</Count>
 				<ElectricMachineSystem>
 					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
@@ -50,16 +50,16 @@
 						<AppVersion>aaaaa</AppVersion>
 						<ElectricMachineType>ASM</ElectricMachineType>
 						<CertificationMethod>Measured</CertificationMethod>
-						<R85RatedPower>50000</R85RatedPower>
-						<RotationalInertia>0.10</RotationalInertia>
+						<R85RatedPower>350000</R85RatedPower>
+						<RotationalInertia>0.23</RotationalInertia>
 						<DcDcConverterIncluded>true</DcDcConverterIncluded>
 						<IHPCType>None</IHPCType>
 						<VoltageLevel>
 							<Voltage>400</Voltage>
-							<ContinuousTorque>200.00</ContinuousTorque>
+							<ContinuousTorque>23873.24</ContinuousTorque>
 							<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
-							<OverloadTorque>400.00</OverloadTorque>
-							<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+							<OverloadTorque>25873.24</OverloadTorque>
+							<TestSpeedOverloadTorque>2500.00</TestSpeedOverloadTorque>
 							<OverloadDuration>30.00</OverloadDuration>
 							<MaxTorqueCurve>
 								<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
@@ -2085,10 +2085,10 @@
 						</VoltageLevel>
 						<VoltageLevel>
 							<Voltage>600</Voltage>
-							<ContinuousTorque>200.00</ContinuousTorque>
+							<ContinuousTorque>23873.24</ContinuousTorque>
 							<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
-							<OverloadTorque>400.00</OverloadTorque>
-							<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+							<OverloadTorque>25873.24</OverloadTorque>
+							<TestSpeedOverloadTorque>2500.00</TestSpeedOverloadTorque>
 							<OverloadDuration>30.00</OverloadDuration>
 							<MaxTorqueCurve>
 								<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
@@ -4114,7 +4114,7 @@
 						</VoltageLevel>
 						<DragCurve>
 							<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
-							<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
+							<Entry outShaftSpeed="7363.00" dragTorque="30.00"/>
 						</DragCurve>
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
@@ -4221,6 +4221,8 @@
 				  <Gears xsi:type="GearsDeclarationType">
 					<Gear number="1">
 					  <Ratio>14.930</Ratio>
+					  <MaxTorque>5000</MaxTorque>
+					  <MaxSpeed>2900</MaxSpeed>
 					  <TorqueLossMap>
 						<Entry inputSpeed="0.00" inputTorque="-5500.00" torqueLoss="239.20" />
 						<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="219.20" />
@@ -4458,6 +4460,8 @@
 					</Gear>
 					<Gear number="2">
 					  <Ratio>11.640</Ratio>
+					  <MaxTorque>5000</MaxTorque>
+					  <MaxSpeed>2900</MaxSpeed>
 					  <TorqueLossMap>
 						<Entry inputSpeed="0.00" inputTorque="-5500.00" torqueLoss="239.20" />
 						<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="219.20" />
@@ -4695,6 +4699,8 @@
 					</Gear>
 					<Gear number="3">
 					  <Ratio>9.020</Ratio>
+					  <MaxTorque>5000</MaxTorque>
+					  <MaxSpeed>2900</MaxSpeed>
 					  <TorqueLossMap>
 						<Entry inputSpeed="0.00" inputTorque="-5500.00" torqueLoss="239.20" />
 						<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="219.20" />
@@ -4932,6 +4938,8 @@
 					</Gear>
 					<Gear number="4">
 					  <Ratio>7.040</Ratio>
+					  <MaxTorque>5000</MaxTorque>
+					  <MaxSpeed>2900</MaxSpeed>
 					  <TorqueLossMap>
 						<Entry inputSpeed="0.00" inputTorque="-5500.00" torqueLoss="239.20" />
 						<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="219.20" />
@@ -5169,6 +5177,8 @@
 					</Gear>
 					<Gear number="5">
 					  <Ratio>5.640</Ratio>
+					  <MaxTorque>5000</MaxTorque>
+					  <MaxSpeed>2900</MaxSpeed>
 					  <TorqueLossMap>
 						<Entry inputSpeed="0.00" inputTorque="-5500.00" torqueLoss="239.20" />
 						<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="219.20" />
@@ -5406,6 +5416,8 @@
 					</Gear>
 					<Gear number="6">
 					  <Ratio>4.400</Ratio>
+					  <MaxTorque>5000</MaxTorque>
+					  <MaxSpeed>2900</MaxSpeed>
 					  <TorqueLossMap>
 						<Entry inputSpeed="0.00" inputTorque="-5500.00" torqueLoss="239.20" />
 						<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="219.20" />
@@ -5643,6 +5655,8 @@
 					</Gear>
 					<Gear number="7">
 					  <Ratio>3.390</Ratio>
+					  <MaxTorque>5000</MaxTorque>
+					  <MaxSpeed>2900</MaxSpeed>
 					  <TorqueLossMap>
 						<Entry inputSpeed="0.00" inputTorque="-5500.00" torqueLoss="239.20" />
 						<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="219.20" />
@@ -5880,6 +5894,8 @@
 					</Gear>
 					<Gear number="8">
 					  <Ratio>2.650</Ratio>
+					  <MaxTorque>5000</MaxTorque>
+					  <MaxSpeed>2900</MaxSpeed>
 					  <TorqueLossMap>
 						<Entry inputSpeed="0.00" inputTorque="-5500.00" torqueLoss="239.20" />
 						<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="219.20" />
@@ -6117,6 +6133,8 @@
 					</Gear>
 					<Gear number="9">
 					  <Ratio>2.050</Ratio>
+					  <MaxTorque>5000</MaxTorque>
+					  <MaxSpeed>2900</MaxSpeed>
 					  <TorqueLossMap>
 						<Entry inputSpeed="0.00" inputTorque="-5500.00" torqueLoss="239.20" />
 						<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="219.20" />
@@ -6354,6 +6372,8 @@
 					</Gear>
 					<Gear number="10">
 					  <Ratio>1.600</Ratio>
+					  <MaxTorque>5000</MaxTorque>
+					  <MaxSpeed>2900</MaxSpeed>
 					  <TorqueLossMap>
 						<Entry inputSpeed="0.00" inputTorque="-5500.00" torqueLoss="239.20" />
 						<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="219.20" />
@@ -6591,6 +6611,8 @@
 					</Gear>
 					<Gear number="11">
 					  <Ratio>1.280</Ratio>
+					  <MaxTorque>5000</MaxTorque>
+					  <MaxSpeed>2900</MaxSpeed>
 					  <TorqueLossMap>
 						<Entry inputSpeed="0.00" inputTorque="-5500.00" torqueLoss="239.20" />
 						<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="219.20" />
@@ -6828,6 +6850,8 @@
 					</Gear>
 					<Gear number="12">
 					  <Ratio>1.000</Ratio>
+					  <MaxTorque>5000</MaxTorque>
+					  <MaxSpeed>2900</MaxSpeed>
 					  <TorqueLossMap>
 						<Entry inputSpeed="0.00" inputTorque="-5500.00" torqueLoss="74.20" />
 						<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="69.20" />
@@ -7425,7 +7449,6 @@
 						<Entry inputSpeed="1853.00" inputTorque="2098.00" torqueLoss="64.00"/>
 						<Entry inputSpeed="1853.00" inputTorque="2515.00" torqueLoss="73.00"/>
 						<Entry inputSpeed="1853.00" inputTorque="2928.00" torqueLoss="79.00"/>
-						
 					</TorqueLossMap>
 				</v2.0:Data>
 				<v2.0:Signature>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/V24_DeclarationMode/HeavyLorry/PEV_heavyLorry_E3_realistic.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/V24_DeclarationMode/HeavyLorry/PEV_heavyLorry_E3_realistic.xml
index f6b4c51a2a..56b36079e7 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/V24_DeclarationMode/HeavyLorry/PEV_heavyLorry_E3_realistic.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/V24_DeclarationMode/HeavyLorry/PEV_heavyLorry_E3_realistic.xml
@@ -9,8 +9,8 @@
 		<LegislativeCategory>N3</LegislativeCategory>
 		<ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
 		<AxleConfiguration>4x2</AxleConfiguration>
-		<CorrectedActualMass>6000</CorrectedActualMass>
-		<TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
+		<CorrectedActualMass>4670</CorrectedActualMass>
+		<TechnicalPermissibleMaximumLadenMass>11900</TechnicalPermissibleMaximumLadenMass>
 		<RetarderType>None</RetarderType>
 		<AngledriveType>None</AngledriveType>
 		<PTO xsi:type="PTOType"> <!-- syntactically allowed, not supported by VECTO - no gearbox! -->
@@ -23,7 +23,7 @@
 		<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
 		<ArchitectureID>E3</ArchitectureID>
 		<ADAS xsi:type="ADAS_PEV_Type">
-			<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+			<PredictiveCruiseControl>none</PredictiveCruiseControl>
 		</ADAS>
 		<ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType">
 			<!-- optional -->
@@ -49,9 +49,9 @@
 		<Components xsi:type="Components_PEV-E3_LorryType">
 			<ElectricMachine>
 				<PowertrainPosition>3</PowertrainPosition>
-				<Count>1</Count>
+				<Count>2</Count>
 				<ElectricMachineSystem>
-					<v2.3:Data xsi:type="v2.3:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -59,20 +59,91 @@
 						<AppVersion>aaaaa</AppVersion>
 						<ElectricMachineType>ASM</ElectricMachineType>
 						<CertificationMethod>Measured</CertificationMethod>
-						<R85RatedPower>50000</R85RatedPower>
-						<RotationalInertia>0.10</RotationalInertia>
+						<R85RatedPower>350000</R85RatedPower>
+						<RotationalInertia>0.23</RotationalInertia>
 						<DcDcConverterIncluded>true</DcDcConverterIncluded>
 						<IHPCType>None</IHPCType>
 						<VoltageLevel>
-							<Voltage>400</Voltage>
-							<ContinuousTorque>200.00</ContinuousTorque>
+							<Voltage>600</Voltage>
+							<ContinuousTorque>143.24</ContinuousTorque>
 							<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
-							<OverloadTorque>400.00</OverloadTorque>
-							<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+							<OverloadTorque>153.24</OverloadTorque>
+							<TestSpeedOverloadTorque>2500.00</TestSpeedOverloadTorque>
 							<OverloadDuration>30.00</OverloadDuration>
 							<MaxTorqueCurve>
-								<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
-								<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+<Entry outShaftSpeed="0.00" maxTorque="485.00" minTorque="-485.00"/>
+<Entry outShaftSpeed="2461.16" maxTorque="485.00" minTorque="-485.00"/>
+<Entry outShaftSpeed="2452.14" maxTorque="485.00" minTorque="-485.00"/>
+<Entry outShaftSpeed="2466.86" maxTorque="483.88" minTorque="-483.88"/>
+<Entry outShaftSpeed="2481.59" maxTorque="481.01" minTorque="-481.01"/>
+<Entry outShaftSpeed="2496.32" maxTorque="478.17" minTorque="-478.17"/>
+<Entry outShaftSpeed="2503.68" maxTorque="476.77" minTorque="-476.77"/>
+<Entry outShaftSpeed="2577.32" maxTorque="463.14" minTorque="-463.14"/>
+<Entry outShaftSpeed="2650.96" maxTorque="450.27" minTorque="-450.27"/>
+<Entry outShaftSpeed="2724.59" maxTorque="438.10" minTorque="-438.10"/>
+<Entry outShaftSpeed="2798.23" maxTorque="426.58" minTorque="-426.58"/>
+<Entry outShaftSpeed="2871.87" maxTorque="415.64" minTorque="-415.64"/>
+<Entry outShaftSpeed="2945.51" maxTorque="405.25" minTorque="-405.25"/>
+<Entry outShaftSpeed="3019.15" maxTorque="395.36" minTorque="-395.36"/>
+<Entry outShaftSpeed="3092.78" maxTorque="385.95" minTorque="-385.95"/>
+<Entry outShaftSpeed="3166.42" maxTorque="376.98" minTorque="-376.98"/>
+<Entry outShaftSpeed="3240.06" maxTorque="368.41" minTorque="-368.41"/>
+<Entry outShaftSpeed="3313.70" maxTorque="360.22" minTorque="-360.22"/>
+<Entry outShaftSpeed="3387.33" maxTorque="352.39" minTorque="-352.39"/>
+<Entry outShaftSpeed="3460.97" maxTorque="344.90" minTorque="-344.90"/>
+<Entry outShaftSpeed="3534.61" maxTorque="337.71" minTorque="-337.71"/>
+<Entry outShaftSpeed="3608.25" maxTorque="330.82" minTorque="-330.82"/>
+<Entry outShaftSpeed="3681.89" maxTorque="324.20" minTorque="-324.20"/>
+<Entry outShaftSpeed="3755.52" maxTorque="317.84" minTorque="-317.84"/>
+<Entry outShaftSpeed="3829.16" maxTorque="311.73" minTorque="-311.73"/>
+<Entry outShaftSpeed="3902.80" maxTorque="305.85" minTorque="-305.85"/>
+<Entry outShaftSpeed="3976.44" maxTorque="300.18" minTorque="-300.18"/>
+<Entry outShaftSpeed="4050.07" maxTorque="294.72" minTorque="-294.72"/>
+<Entry outShaftSpeed="4123.71" maxTorque="289.46" minTorque="-289.46"/>
+<Entry outShaftSpeed="4197.35" maxTorque="284.38" minTorque="-284.38"/>
+<Entry outShaftSpeed="4270.99" maxTorque="279.48" minTorque="-279.48"/>
+<Entry outShaftSpeed="4344.62" maxTorque="274.74" minTorque="-274.74"/>
+<Entry outShaftSpeed="4418.26" maxTorque="270.17" minTorque="-270.17"/>
+<Entry outShaftSpeed="4491.90" maxTorque="265.73" minTorque="-265.73"/>
+<Entry outShaftSpeed="4565.54" maxTorque="261.45" minTorque="-261.45"/>
+<Entry outShaftSpeed="4639.18" maxTorque="257.30" minTorque="-257.30"/>
+<Entry outShaftSpeed="4712.81" maxTorque="253.28" minTorque="-253.28"/>
+<Entry outShaftSpeed="4786.45" maxTorque="249.39" minTorque="-249.39"/>
+<Entry outShaftSpeed="4860.09" maxTorque="245.60" minTorque="-245.60"/>
+<Entry outShaftSpeed="4933.73" maxTorque="241.94" minTorque="-241.94"/>
+<Entry outShaftSpeed="5007.36" maxTorque="238.38" minTorque="-238.38"/>
+<Entry outShaftSpeed="5081.00" maxTorque="234.92" minTorque="-234.92"/>
+<Entry outShaftSpeed="5154.64" maxTorque="231.58" minTorque="-231.58"/>
+<Entry outShaftSpeed="5228.28" maxTorque="228.31" minTorque="-228.31"/>
+<Entry outShaftSpeed="5301.91" maxTorque="225.14" minTorque="-225.14"/>
+<Entry outShaftSpeed="5375.55" maxTorque="222.06" minTorque="-222.06"/>
+<Entry outShaftSpeed="5449.19" maxTorque="219.05" minTorque="-219.05"/>
+<Entry outShaftSpeed="5522.83" maxTorque="216.13" minTorque="-216.13"/>
+<Entry outShaftSpeed="5596.47" maxTorque="213.29" minTorque="-213.29"/>
+<Entry outShaftSpeed="5670.10" maxTorque="210.51" minTorque="-210.51"/>
+<Entry outShaftSpeed="5743.74" maxTorque="207.82" minTorque="-207.82"/>
+<Entry outShaftSpeed="5817.38" maxTorque="205.19" minTorque="-205.19"/>
+<Entry outShaftSpeed="5891.02" maxTorque="202.62" minTorque="-202.62"/>
+<Entry outShaftSpeed="5964.65" maxTorque="200.12" minTorque="-200.12"/>
+<Entry outShaftSpeed="6038.29" maxTorque="197.69" minTorque="-197.69"/>
+<Entry outShaftSpeed="6111.93" maxTorque="195.30" minTorque="-195.30"/>
+<Entry outShaftSpeed="6185.57" maxTorque="192.97" minTorque="-192.97"/>
+<Entry outShaftSpeed="6259.20" maxTorque="190.70" minTorque="-190.70"/>
+<Entry outShaftSpeed="6332.84" maxTorque="188.48" minTorque="-188.48"/>
+<Entry outShaftSpeed="6406.48" maxTorque="186.32" minTorque="-186.32"/>
+<Entry outShaftSpeed="6480.12" maxTorque="184.20" minTorque="-184.20"/>
+<Entry outShaftSpeed="6553.76" maxTorque="182.13" minTorque="-182.13"/>
+<Entry outShaftSpeed="6627.39" maxTorque="180.10" minTorque="-180.10"/>
+<Entry outShaftSpeed="6701.03" maxTorque="178.13" minTorque="-178.13"/>
+<Entry outShaftSpeed="6774.67" maxTorque="176.20" minTorque="-176.20"/>
+<Entry outShaftSpeed="6848.31" maxTorque="174.30" minTorque="-174.30"/>
+<Entry outShaftSpeed="6921.94" maxTorque="172.44" minTorque="-172.44"/>
+<Entry outShaftSpeed="6995.58" maxTorque="170.64" minTorque="-170.64"/>
+<Entry outShaftSpeed="7069.22" maxTorque="168.85" minTorque="-168.85"/>
+<Entry outShaftSpeed="7142.86" maxTorque="167.11" minTorque="-167.11"/>
+<Entry outShaftSpeed="7216.49" maxTorque="165.41" minTorque="-165.41"/>
+<Entry outShaftSpeed="7290.13" maxTorque="163.74" minTorque="-163.74"/>
+<Entry outShaftSpeed="7363.77" maxTorque="162.10" minTorque="-162.10"/>
 							</MaxTorqueCurve>
 							<PowerMap>
 								<Entry outShaftSpeed="0.00" torque="-485.00" electricPower="8.79"/>
@@ -2094,15 +2165,86 @@
 						</VoltageLevel>
 						<VoltageLevel>
 							<Voltage>600</Voltage>
-							<ContinuousTorque>200.00</ContinuousTorque>
+							<ContinuousTorque>143.24</ContinuousTorque>
 							<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
-							<OverloadTorque>400.00</OverloadTorque>
-							<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+							<OverloadTorque>153.24</OverloadTorque>
+							<TestSpeedOverloadTorque>2500.00</TestSpeedOverloadTorque>
 							<OverloadDuration>30.00</OverloadDuration>
 							<MaxTorqueCurve>
-								<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
-								<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
-							</MaxTorqueCurve>
+								<Entry outShaftSpeed="0.00" maxTorque="485.00" minTorque="-485.00"/>
+								<Entry outShaftSpeed="2461.16" maxTorque="485.00" minTorque="-485.00"/>
+								<Entry outShaftSpeed="2452.14" maxTorque="485.00" minTorque="-485.00"/>
+								<Entry outShaftSpeed="2466.86" maxTorque="483.88" minTorque="-483.88"/>
+								<Entry outShaftSpeed="2481.59" maxTorque="481.01" minTorque="-481.01"/>
+								<Entry outShaftSpeed="2496.32" maxTorque="478.17" minTorque="-478.17"/>
+								<Entry outShaftSpeed="2503.68" maxTorque="476.77" minTorque="-476.77"/>
+								<Entry outShaftSpeed="2577.32" maxTorque="463.14" minTorque="-463.14"/>
+								<Entry outShaftSpeed="2650.96" maxTorque="450.27" minTorque="-450.27"/>
+								<Entry outShaftSpeed="2724.59" maxTorque="438.10" minTorque="-438.10"/>
+								<Entry outShaftSpeed="2798.23" maxTorque="426.58" minTorque="-426.58"/>
+								<Entry outShaftSpeed="2871.87" maxTorque="415.64" minTorque="-415.64"/>
+								<Entry outShaftSpeed="2945.51" maxTorque="405.25" minTorque="-405.25"/>
+								<Entry outShaftSpeed="3019.15" maxTorque="395.36" minTorque="-395.36"/>
+								<Entry outShaftSpeed="3092.78" maxTorque="385.95" minTorque="-385.95"/>
+								<Entry outShaftSpeed="3166.42" maxTorque="376.98" minTorque="-376.98"/>
+								<Entry outShaftSpeed="3240.06" maxTorque="368.41" minTorque="-368.41"/>
+								<Entry outShaftSpeed="3313.70" maxTorque="360.22" minTorque="-360.22"/>
+								<Entry outShaftSpeed="3387.33" maxTorque="352.39" minTorque="-352.39"/>
+								<Entry outShaftSpeed="3460.97" maxTorque="344.90" minTorque="-344.90"/>
+								<Entry outShaftSpeed="3534.61" maxTorque="337.71" minTorque="-337.71"/>
+								<Entry outShaftSpeed="3608.25" maxTorque="330.82" minTorque="-330.82"/>
+								<Entry outShaftSpeed="3681.89" maxTorque="324.20" minTorque="-324.20"/>
+								<Entry outShaftSpeed="3755.52" maxTorque="317.84" minTorque="-317.84"/>
+								<Entry outShaftSpeed="3829.16" maxTorque="311.73" minTorque="-311.73"/>
+								<Entry outShaftSpeed="3902.80" maxTorque="305.85" minTorque="-305.85"/>
+								<Entry outShaftSpeed="3976.44" maxTorque="300.18" minTorque="-300.18"/>
+								<Entry outShaftSpeed="4050.07" maxTorque="294.72" minTorque="-294.72"/>
+								<Entry outShaftSpeed="4123.71" maxTorque="289.46" minTorque="-289.46"/>
+								<Entry outShaftSpeed="4197.35" maxTorque="284.38" minTorque="-284.38"/>
+								<Entry outShaftSpeed="4270.99" maxTorque="279.48" minTorque="-279.48"/>
+								<Entry outShaftSpeed="4344.62" maxTorque="274.74" minTorque="-274.74"/>
+								<Entry outShaftSpeed="4418.26" maxTorque="270.17" minTorque="-270.17"/>
+								<Entry outShaftSpeed="4491.90" maxTorque="265.73" minTorque="-265.73"/>
+								<Entry outShaftSpeed="4565.54" maxTorque="261.45" minTorque="-261.45"/>
+								<Entry outShaftSpeed="4639.18" maxTorque="257.30" minTorque="-257.30"/>
+								<Entry outShaftSpeed="4712.81" maxTorque="253.28" minTorque="-253.28"/>
+								<Entry outShaftSpeed="4786.45" maxTorque="249.39" minTorque="-249.39"/>
+								<Entry outShaftSpeed="4860.09" maxTorque="245.60" minTorque="-245.60"/>
+								<Entry outShaftSpeed="4933.73" maxTorque="241.94" minTorque="-241.94"/>
+								<Entry outShaftSpeed="5007.36" maxTorque="238.38" minTorque="-238.38"/>
+								<Entry outShaftSpeed="5081.00" maxTorque="234.92" minTorque="-234.92"/>
+								<Entry outShaftSpeed="5154.64" maxTorque="231.58" minTorque="-231.58"/>
+								<Entry outShaftSpeed="5228.28" maxTorque="228.31" minTorque="-228.31"/>
+								<Entry outShaftSpeed="5301.91" maxTorque="225.14" minTorque="-225.14"/>
+								<Entry outShaftSpeed="5375.55" maxTorque="222.06" minTorque="-222.06"/>
+								<Entry outShaftSpeed="5449.19" maxTorque="219.05" minTorque="-219.05"/>
+								<Entry outShaftSpeed="5522.83" maxTorque="216.13" minTorque="-216.13"/>
+								<Entry outShaftSpeed="5596.47" maxTorque="213.29" minTorque="-213.29"/>
+								<Entry outShaftSpeed="5670.10" maxTorque="210.51" minTorque="-210.51"/>
+								<Entry outShaftSpeed="5743.74" maxTorque="207.82" minTorque="-207.82"/>
+								<Entry outShaftSpeed="5817.38" maxTorque="205.19" minTorque="-205.19"/>
+								<Entry outShaftSpeed="5891.02" maxTorque="202.62" minTorque="-202.62"/>
+								<Entry outShaftSpeed="5964.65" maxTorque="200.12" minTorque="-200.12"/>
+								<Entry outShaftSpeed="6038.29" maxTorque="197.69" minTorque="-197.69"/>
+								<Entry outShaftSpeed="6111.93" maxTorque="195.30" minTorque="-195.30"/>
+								<Entry outShaftSpeed="6185.57" maxTorque="192.97" minTorque="-192.97"/>
+								<Entry outShaftSpeed="6259.20" maxTorque="190.70" minTorque="-190.70"/>
+								<Entry outShaftSpeed="6332.84" maxTorque="188.48" minTorque="-188.48"/>
+								<Entry outShaftSpeed="6406.48" maxTorque="186.32" minTorque="-186.32"/>
+								<Entry outShaftSpeed="6480.12" maxTorque="184.20" minTorque="-184.20"/>
+								<Entry outShaftSpeed="6553.76" maxTorque="182.13" minTorque="-182.13"/>
+								<Entry outShaftSpeed="6627.39" maxTorque="180.10" minTorque="-180.10"/>
+								<Entry outShaftSpeed="6701.03" maxTorque="178.13" minTorque="-178.13"/>
+								<Entry outShaftSpeed="6774.67" maxTorque="176.20" minTorque="-176.20"/>
+								<Entry outShaftSpeed="6848.31" maxTorque="174.30" minTorque="-174.30"/>
+								<Entry outShaftSpeed="6921.94" maxTorque="172.44" minTorque="-172.44"/>
+								<Entry outShaftSpeed="6995.58" maxTorque="170.64" minTorque="-170.64"/>
+								<Entry outShaftSpeed="7069.22" maxTorque="168.85" minTorque="-168.85"/>
+								<Entry outShaftSpeed="7142.86" maxTorque="167.11" minTorque="-167.11"/>
+								<Entry outShaftSpeed="7216.49" maxTorque="165.41" minTorque="-165.41"/>
+								<Entry outShaftSpeed="7290.13" maxTorque="163.74" minTorque="-163.74"/>
+								<Entry outShaftSpeed="7363.77" maxTorque="162.10" minTorque="-162.10"/>
+															</MaxTorqueCurve>
 							<PowerMap>
 								<Entry outShaftSpeed="0.00" torque="-485.00" electricPower="8.79"/>
 <Entry outShaftSpeed="0.00" torque="-469.84" electricPower="8.28"/>
@@ -4123,28 +4265,47 @@
 						</VoltageLevel>
 						<DragCurve>
 							<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
-							<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
+							<Entry outShaftSpeed="7363.00" dragTorque="30.00"/>
 						</DragCurve>
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
 					</v2.3:Data>
 					<v2.3:Signature>
-						<di:Reference URI="#EM-1234">
-							<di:Transforms>
-								<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
-								<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
-							</di:Transforms>
-							<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-							<di:DigestValue>siONkqzC3QW+4si2eVwLNTwtAxUM0dxMFdAYXjVNl+0=</di:DigestValue>
+						<di:Reference>
+							<di:DigestMethod Algorithm=""/>
+							<di:DigestValue/>
 						</di:Reference>
 					</v2.3:Signature>
 				</ElectricMachineSystem>
-				<P2.5GearRatios>
-					<!-- only for P2.5 HEV -->
+				<ADC>
+					<Data xsi:type="ADCDataDeclarationType" id="ADC-123498" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
+						<Manufacturer>ADC MAnufacturer</Manufacturer>
+						<Model>Some ADC Model</Model>
+						<CertificationNumber>CertNbr 1234987</CertificationNumber>
+						<Date>2022-01-01T00:00:00Z</Date>
+						<AppVersion>ADC PreProcessing 1.0</AppVersion>
+						<Ratio>8.567</Ratio>
+						<CertificationMethod>Option 2</CertificationMethod>
+						<TorqueLossMap>
+							<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="0.00"/>
+							<Entry inputSpeed="0.00" inputTorque="500.00" torqueLoss="5.00"/>
+							<Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="0.00"/>
+							<Entry inputSpeed="1000.00" inputTorque="500.00" torqueLoss="5.00"/>
+						</TorqueLossMap>
+					</Data>
+					<v2.3:Signature>
+						<di:Reference>
+							<di:DigestMethod Algorithm=""></di:DigestMethod>
+							<di:DigestValue></di:DigestValue>
+						</di:Reference>
+					</v2.3:Signature>
+				</ADC>	
+				<!-- <P2.5GearRatios>
+					only for P2.5 HEV
 					<Ratio gear="1">1.000</Ratio>
 					<Ratio gear="2">2.000</Ratio>
-				</P2.5GearRatios>
+				</P2.5GearRatios> -->
 			</ElectricMachine>
 			<ElectricEnergyStorage>
 				<Battery>
-- 
GitLab