From d5e434dbdc6e7521e285cc577476ffd342d13eca Mon Sep 17 00:00:00 2001 From: Markus Quaritsch <markus.quaritsch@tugraz.at> Date: Fri, 26 Feb 2016 15:56:52 +0100 Subject: [PATCH] removed long-running attribute --- .../SimulationComponent/Impl/DefaultDriverStrategy.cs | 2 +- .../Integration/DriverStrategy/DriverStrategyTestTruck.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs b/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs index ce338bb308..4a37bdf994 100644 --- a/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs +++ b/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs @@ -77,7 +77,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl var remainingDistance = NextDrivingAction.ActionDistance - currentDistance; var estimatedNextTimestep = remainingDistance / Driver.DataBus.VehicleSpeed; if (remainingDistance.IsEqual(0.SI<Meter>(), Constants.SimulationSettings.DriverActionDistanceTolerance) || - estimatedNextTimestep.IsSmaller(Constants.SimulationSettings.LowerBoundTimeInterval) { + estimatedNextTimestep.IsSmaller(Constants.SimulationSettings.LowerBoundTimeInterval)) { CurrentDrivingMode = DrivingMode.DrivingModeBrake; DrivingModes[CurrentDrivingMode].ResetMode(); Log.Debug("Switching to DrivingMode BRAKE"); diff --git a/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestTruck.cs b/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestTruck.cs index 0ea5c450bf..9c1df467aa 100644 --- a/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestTruck.cs +++ b/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestTruck.cs @@ -397,7 +397,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Decelerate_60_20_uphill_25.vmod"); } - [TestMethod, TestCategory("LongRunning")] + [TestMethod] public void Truck_Decelerate_60_20_downhill_25() { var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_60_20_downhill_25); @@ -425,7 +425,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Decelerate_60_20_uphill_15.vmod"); } - [TestMethod, TestCategory("LongRunning")] + [TestMethod] public void Truck_Decelerate_60_20_downhill_15() { var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_60_20_downhill_15); @@ -526,7 +526,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Decelerate_80_0_steep_uphill_25.vmod"); } - [TestMethod, TestCategory("LongRunning")] + [TestMethod] public void Truck_Decelerate_80_0_downhill_25() { var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_80_0_downhill_25); -- GitLab