diff --git a/VECTO.sln b/VECTO.sln index 5f00660e5d09ac468df68b64be6517f324be2e56..f368a7cfa675a942f32fac4d8d2d66d5c04fecb1 100644 --- a/VECTO.sln +++ b/VECTO.sln @@ -747,6 +747,5 @@ Global {7C364099-9B85-473A-8A42-BBEBE4798FF5} = {CC93EA68-F3FE-4BCB-9292-1101F94A4D09} {B673E12F-D323-4C4C-8805-9915B2C72D3D} = {73A5BF70-6168-456F-95E5-A1402BFA488C} {760C1C5B-A767-463E-BA85-F0BCFC23A550} = {73A5BF70-6168-456F-95E5-A1402BFA488C} - {EF99431D-4227-44C3-B2BD-DE8AE3E672CA} = {CC93EA68-F3FE-4BCB-9292-1101F94A4D09} EndGlobalSection EndGlobal diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponentData/TorqueConverterDataTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/TorqueConverterDataTest.cs index 9e07f8dee4d34437c704b1142107b1ab1aef695b..0588a6b719d6bae015ec50808419e3b07f5d3371 100644 --- a/VectoCore/VectoCoreTest/Models/SimulationComponentData/TorqueConverterDataTest.cs +++ b/VectoCore/VectoCoreTest/Models/SimulationComponentData/TorqueConverterDataTest.cs @@ -527,72 +527,6 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData } } - [TestCase] - public void TestOperatingPointSearch() - { - var dao = new DeclarationDataAdapter(); - var gbxInputData = new JSONComponentInputData(@"E:\QUAM\Workspace\VECTO-Bugreports\BugReportTests\Bugreport Jobs\20181204_Daimler_VECTO-797_CTTWDB9560342V252797_DrivingAction\Allison_3000_P-6_3.49-0.65_6.824-A2G__CTTWDB9560342V252797.vgbx", null); - var engineInputData = new JSONComponentInputData( - @"E:\QUAM\Workspace\VECTO-Bugreports\BugReportTests\Bugreport Jobs\20181204_Daimler_VECTO-797_CTTWDB9560342V252797_DrivingAction\OM936LA200kW1100Nm-1.Gen-Euro6M5M-Euro6OBD-C_CTTWDB9560342V252797.veng", null); - - var engineData = dao.CreateEngineData(engineInputData.EngineInputData, 600.RPMtoRad(), gbxInputData.GearboxInputData, new List<ITorqueLimitInputData>()); - var tccData = dao.CreateGearboxData( - gbxInputData.GearboxInputData, engineData, - ((IVehicleDeclarationInputData)gbxInputData.Vehicle).AxleGearInputData.Ratio, 0.5.SI<Meter>(), - VehicleCategory.Tractor); - - var container = new MockVehicleContainer(); - - var runData = new VectoRunData() { - GearboxData = tccData, - EngineData = engineData - }; - var shiftStrategy = new ATShiftStrategy(tccData, container); - var gearbox = new ATGearbox(container, shiftStrategy, runData); // new MockGearbox(container); - var tc = new TorqueConverter( - gearbox, shiftStrategy, container, tccData.TorqueConverterData, runData); - var engine = new CombustionEngine(container, engineData); - container.Engine = engine; - - tc.Connect(engine); - - gearbox.Gear = 2; - tc.Initialize(100.SI<NewtonMeter>(), 680.RPMtoRad()); - - container.EngineSpeed = engine.EngineSpeed; - - var absTime = 0.SI<Second>(); - var dt = 0.2.SI<Second>(); - - gearbox.Gear = 1; - - var outTorque = 70.SI<NewtonMeter>(); - var outSpeed = 1200.RPMtoRad(); - tc.PreviousState.InTorque = 410.SI<NewtonMeter>(); - var response = tc.Request(absTime, dt, outTorque, outSpeed); - - Assert.IsInstanceOf<ResponseOverload>(response); - - response = tc.Request(absTime, dt, outTorque, outSpeed, true); - Assert.IsInstanceOf<TorqueConverter>(response.Source); - - var delta = ((ResponseDryRun)response).DeltaFullLoad; - outTorque = SearchAlgorithm.Search( - outTorque, delta, 20.SI<NewtonMeter>(), - getYValue: rsp => { - var r = (ResponseDryRun)rsp; - return r.DeltaFullLoad; - }, - evaluateFunction: t => { - return tc.Request(absTime, dt, t, outSpeed, true); - }, - criterion: rsp => { - var r = (ResponseDryRun)rsp; - return r.DeltaFullLoad.Value(); - }); - - response = tc.Request(absTime, dt, outTorque, outSpeed); - Assert.IsInstanceOf<ResponseSuccess>(response); - } + } } \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/Utils/MockVehicleContainer.cs b/VectoCore/VectoCoreTest/Utils/MockVehicleContainer.cs index 5b05e096d88c411a20827df1195b11475de9e112..62a5dabe43944a7522fe400f9bc0033181f46ab9 100644 --- a/VectoCore/VectoCoreTest/Utils/MockVehicleContainer.cs +++ b/VectoCore/VectoCoreTest/Utils/MockVehicleContainer.cs @@ -87,7 +87,7 @@ namespace TUGraz.VectoCore.Tests.Utils throw new System.NotImplementedException(); } - public Second LastShift { get; private set; } + public Second LastShift { get; set; } public GearData GetGearData(uint gear) {