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

Merge pull request #434 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-516-axlegear-losses-for-estimation to develop

* commit '9985a18b':
  adapt expected fc due to changes in estimating losses (diffeent GS behavior)
  fix: better estimation of axle losses for estimating acceleration

VectoCommon/VectoCommon/Models/AuxiliaryModel.cs

@@ -29,8 +29,6 @@
 *   Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
 */
 
-using System;
-
 namespace TUGraz.VectoCommon.Models
 {
 	public enum AuxiliaryModel

VectoCommon/VectoCommon/Models/AxleConfiguration.cs

@@ -30,7 +30,6 @@
 */
 
 using System;
-using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using TUGraz.VectoCommon.Utils;
 

VectoCommon/VectoCommon/OutputData/IOutputFileWriter.cs

@@ -29,7 +29,6 @@
 *   Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
 */
 
-using System;
 using TUGraz.VectoCommon.InputData;
 
 namespace TUGraz.VectoCommon.OutputData

VectoCore/VectoCore/Models/SimulationComponent/Impl/AxleGear.cs

@@ -60,7 +60,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 
 		public Watt AxlegearLoss()
 		{
-			return 0.SI<Watt>(); //PreviousState.TorqueLossResult.Value * PreviousState.InAngularVelocity;
+			return PreviousState.TorqueLossResult.Value * PreviousState.InAngularVelocity;
 		}
 	}
 }
\ No newline at end of file

VectoCore/VectoCoreTest/Integration/FuelTypesTest.cs

@@ -43,16 +43,16 @@ namespace TUGraz.VectoCore.Tests.Integration
 	public class FuelTypesTest
 	{
 		[TestCase(FuelType.DieselCI,
-			@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 0, 0.0006944, 9383.8223,
+			@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 0, 0.0006944, 9394.4751,
 			TestName = "Diesel LH Low"),
 		TestCase(FuelType.EthanolCI,
-			@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 0, 0.0004197, 6417.04,
+			@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 0, 0.0004197, 6424.3249,
 			TestName = "Ethanol LH Low"),
 		TestCase(FuelType.DieselCI,
-			@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1, 0.0008025, 10843.6305,
+			@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1, 0.0008048, 10875.0171,
 			TestName = "Diesel LH Ref"),
 		TestCase(FuelType.EthanolCI,
-			@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1, 0.0004850, 7415.3164,
+			@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1, 0.0004864, 7436.7798,
 			TestName = "Ethanol LH Ref"),]
 		public void TestFuelTypesCO2(FuelType fuelType, string jobName, int runIdx, double expectedCo2, double expectedMJ)
 		{