diff --git a/VectoCore/VectoCore/OutputData/ModalDataContainer.cs b/VectoCore/VectoCore/OutputData/ModalDataContainer.cs index 67017b0c09c48f807628cb449ff61ce704b40cdb..e4bad04e093b0b6fcb906a06bd12a1ba0298e491 100644 --- a/VectoCore/VectoCore/OutputData/ModalDataContainer.cs +++ b/VectoCore/VectoCore/OutputData/ModalDataContainer.cs @@ -304,7 +304,7 @@ namespace TUGraz.VectoCore.OutputData public void FinishSimulation() { - Data.Clear(); //.Rows.Clear(); + //Data.Clear(); //.Rows.Clear(); Data = null; CurrentRow = null; Auxiliaries.Clear(); diff --git a/VectoCore/VectoCoreTest/Reports/ModDataTest.cs b/VectoCore/VectoCoreTest/Reports/ModDataTest.cs index 28a63b52ec3c8eca7c9cfbcc9e4f1dbd1edeb21e..e8d2b34f59284b2c038545cee532b272b6883aad 100644 --- a/VectoCore/VectoCoreTest/Reports/ModDataTest.cs +++ b/VectoCore/VectoCoreTest/Reports/ModDataTest.cs @@ -61,21 +61,20 @@ namespace TUGraz.VectoCore.Tests.Reports var engineData = MockSimulationDataFactory.CreateEngineDataFromFile(Truck40tPowerTrain.EngineFile); - var modData = (ModalDataContainer)run.GetContainer().ModalData; + var modData = ((ModalDataContainer)run.GetContainer().ModalData).Data; run.Run(); Assert.IsTrue(run.FinishedWithoutErrors); var lastGear = 0u; - foreach (DataRow row in modData.Data.Rows) { + foreach (DataRow row in modData.Rows) { if (cycle.Entries.Last().Distance.IsEqual(((Meter)row[(int)ModalResultField.dist]))) { continue; } var gear = (uint)row[(int)ModalResultField.Gear]; var time = (Second)row[(int)ModalResultField.time]; - if ((lastGear == 0 && gear != 0) || (lastGear != 0 && gear == 0)) - { + if ((lastGear == 0 && gear != 0) || (lastGear != 0 && gear == 0)) { //skipNext = (uint)row[(int)ModalResultField.Gear] == 0; lastGear = gear; continue; @@ -143,8 +142,8 @@ namespace TUGraz.VectoCore.Tests.Reports "time: {0} distance: {1}", time, distance); Assert.AreEqual(pEngFcmap.Value(), - (pTrac + pWheelInertia + pBrakeLoss + pLossAxle + pLossRet + pLossGbx + pGbxInertia + pEngInertia + pAux + - pClutchLoss).Value(), 0.5, "time: {0} distance: {1}", time, distance); + (pTrac + pWheelInertia + pBrakeLoss + pLossAxle + pLossRet + pLossGbx + pGbxInertia + pEngInertia + pAux + + pClutchLoss).Value(), 0.5, "time: {0} distance: {1}", time, distance); } lastGear = gear; }