diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationVehicleDataProvider.cs index fc6c70de91bf915f84b1c28c6e76e7f98df69c34..66e6f60b1a85c117c15b86ea3f80783a122b24a2 100644 --- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationVehicleDataProvider.cs +++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationVehicleDataProvider.cs @@ -154,6 +154,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration if ("none".Equals(shaftGearWheels, StringComparison.InvariantCultureIgnoreCase)) { return "None"; } + if ("only one engaged gearwheel above oil level".Equals(shaftGearWheels, StringComparison.CurrentCultureIgnoreCase)) { + return "only one engaged gearwheel above oil level"; + } var otherElements = GetElementValue(Helper.Query(XMLNames.Vehicle_PTO, XMLNames.Vehicle_PTO_OtherElements)); var ptoTech = string.Format("{0} - {1}", shaftGearWheels, otherElements); if (DeclarationData.PTOTransmission.GetTechnologies().Contains(ptoTech)) { diff --git a/VectoCore/VectoCore/Resources/Declaration/VAUX/PTO-tech.csv b/VectoCore/VectoCore/Resources/Declaration/VAUX/PTO-tech.csv index f9aeabc99e0355588c2c35289087888ff40c7139..687cdb2df1cc6c11be2ba3e51d2f7c93820cfb41 100644 --- a/VectoCore/VectoCore/Resources/Declaration/VAUX/PTO-tech.csv +++ b/VectoCore/VectoCore/Resources/Declaration/VAUX/PTO-tech.csv @@ -1,5 +1,6 @@ Technology, Power Loss None,0 +"only one engaged gearwheel above oil level", 0 "only the drive shaft of the PTO - shift claw, synchronizer, sliding gearwheel",50 only the drive shaft of the PTO - multi-disc clutch,1000 "only the drive shaft of the PTO - multi-disc clutch, oil pump",2000 @@ -8,4 +9,4 @@ drive shaft and/or up to 2 gear wheels - multi-disc clutch,1500 "drive shaft and/or up to 2 gear wheels - multi-disc clutch, oil pump",3000 "drive shaft and/or more than 2 gear wheels - shift claw, synchronizer, sliding gearwheel",600 drive shaft and/or more than 2 gear wheels - multi-disc clutch,2000 -"drive shaft and/or more than 2 gear wheels - multi-disc clutch, oil pump",4000 +"drive shaft and/or more than 2 gear wheels - multi-disc clutch, oil pump",4000 \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs index 7025dc8702678d18b9427e9c4441a6cc3c8c6bf9..9d9b96fb64c483cd6c396c258a05b7eb34d00ff9 100644 --- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs +++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs @@ -282,7 +282,8 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration TestCase("drive shaft and/or up to 2 gear wheels - multi-disc clutch, oil pump", 3000), TestCase("drive shaft and/or more than 2 gear wheels - shift claw, synchronizer, sliding gearwheel", 600), TestCase("drive shaft and/or more than 2 gear wheels - multi-disc clutch", 2000), - TestCase("drive shaft and/or more than 2 gear wheels - multi-disc clutch, oil pump", 4000),] + TestCase("drive shaft and/or more than 2 gear wheels - multi-disc clutch, oil pump", 4000), + TestCase("only one engaged gearwheel above oil level", 0)] public void AuxPTOTransmissionTest(string technology, double value) { AssertHelper.AreRelativeEqual(value, DeclarationData.PTOTransmission.Lookup(technology)); diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj index 3c4fb4b0e47f4a75bb16e0310958e2a1795d5a2e..61f3ada2fe39e1156e5850fc15d608389e8baf74 100644 --- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj +++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj @@ -907,9 +907,6 @@ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Class5_Tractor_DECL.vecto"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> - <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Class5_Tractor_DECL.vsum"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Default.vrlm"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> diff --git a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputTest.cs b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputTest.cs index df49d31fbc678f9383291b821f853bf9323e0005..028f1d49eca016e4830478b27ede8c2294cb0e5e 100644 --- a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputTest.cs +++ b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputTest.cs @@ -616,6 +616,7 @@ namespace TUGraz.VectoCore.Tests.XML { var ptoTypes = new string[][] { new[] { "none", "none" }, + new[] { "only one engaged gearwheel above oil level", "none" }, new[] { "only the drive shaft of the PTO", "shift claw, synchronizer, sliding gearwheel" }, new[] { "only the drive shaft of the PTO", "multi-disc clutch" }, new[] { "only the drive shaft of the PTO", "multi-disc clutch, oil pump" }, @@ -661,6 +662,9 @@ namespace TUGraz.VectoCore.Tests.XML if (ptoType[0] == "none") { Assert.AreEqual("None", inputDataProvider.PTOTransmissionInputData.PTOTransmissionType); + } else if (ptoType[0] == "only one engaged gearwheel above oil level") { + Assert.AreEqual(ptoType[0], + inputDataProvider.PTOTransmissionInputData.PTOTransmissionType); } else { Assert.AreEqual(string.Format("{0} - {1}", ptoType[0], ptoType[1]), inputDataProvider.PTOTransmissionInputData.PTOTransmissionType);