diff --git a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsConventional.cs b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsConventional.cs index 620272e80fbbf3e213d2fe3064c944d0df96f9a1..1ba4c6303b0e68b72c98624dce4bff7f91877f13 100644 --- a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsConventional.cs +++ b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsConventional.cs @@ -16,7 +16,7 @@ using TUGraz.VectoCore.OutputData; using TUGraz.VectoCore.OutputData.FileIO; using TUGraz.VectoCore.Tests.Utils; using TUGraz.VectoCore.Utils; -using static TUGraz.VectoCore.Models.SimulationComponent.Impl.DefaultDriverStrategy.PCCStates; +using static TUGraz.VectoCore.Models.SimulationComponent.Impl.PCCStates; using static TUGraz.VectoCore.Models.SimulationComponent.Impl.DrivingAction; namespace TUGraz.VectoCore.Tests.Integration.ADAS @@ -1377,7 +1377,7 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS (4723, 1e6, OutsideSegment, Accelerate)); - private void TestPCC(string jobName, string cycleName, params (double start, double end, DefaultDriverStrategy.PCCStates pcc, DrivingAction action)[] data) + private void TestPCC(string jobName, string cycleName, params (double start, double end, PCCStates pcc, DrivingAction action)[] data) { jobName = Path.Combine(BasePath, jobName + ".vecto"); @@ -1395,7 +1395,7 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS var expected = data; var segmentWasTested = false; var distances = mod.Columns[ModalResultField.dist.GetName()].Values<Meter>(); - var pccStates = mod.Columns["PCCState"].Values<DefaultDriverStrategy.PCCStates>(); + var pccStates = mod.Columns["PCCState"].Values<PCCStates>(); var actions = mod.Columns["DriverAction"].Values<DrivingAction>(); var vActs = mod.Columns[ModalResultField.v_act.GetName()].Values<MeterPerSecond>(); @@ -1432,7 +1432,7 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS var pccCol = mod.Columns["PCCState"]; var driverActionCol = mod.Columns["DriverAction"]; - var pccStates = pccCol.Values<DefaultDriverStrategy.PCCStates>(); + var pccStates = pccCol.Values<PCCStates>(); var driverAction = driverActionCol.Values<DrivingAction>(); var distances = sCol.Values<Meter>(); var sections = GetDistancesOfStateChanges(pccStates.Zip(driverAction), distances).ToArray(); diff --git a/VectoCore/VectoCoreTest/Utils/MockDriver.cs b/VectoCore/VectoCoreTest/Utils/MockDriver.cs index 527f36a37174eb119728ecb276ff85f2a027a062..27ff91a02f291c83ed83fe97aa27af347b092efa 100644 --- a/VectoCore/VectoCoreTest/Utils/MockDriver.cs +++ b/VectoCore/VectoCoreTest/Utils/MockDriver.cs @@ -123,5 +123,6 @@ namespace TUGraz.VectoCore.Tests.Utils public DrivingAction DrivingAction { get; set; } public MeterPerSquareSecond DriverAcceleration { get; set; } + public PCCStates PCCState => PCCStates.OutsideSegment; } } \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/Utils/MockVehicleContainer.cs b/VectoCore/VectoCoreTest/Utils/MockVehicleContainer.cs index 700aae6934e663e87335f6a951a840bd7103d878..5a5a68898038f5bbce99769758e928970bdc3b6b 100644 --- a/VectoCore/VectoCoreTest/Utils/MockVehicleContainer.cs +++ b/VectoCore/VectoCoreTest/Utils/MockVehicleContainer.cs @@ -232,6 +232,7 @@ namespace TUGraz.VectoCore.Tests.Utils public DrivingAction DrivingAction { get; set; } public MeterPerSquareSecond DriverAcceleration { get; set; } + public PCCStates PCCState => PCCStates.OutsideSegment; public CycleData CycleData { get; set; }