diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs index c43592437d16e535628680356f8b200bf55e6869..37267ad5c79b0c74e76d62dad0ede5fc6c486105 100644 --- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs +++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs @@ -185,7 +185,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON public virtual bool Enabled { - get { return false; // TODO @@@ + get { return false; // TODO mk-2016-05-09: JSON ITorqueConverterInputData.Enabled always true --> as soon as TC is implemented, set to correct value! } } diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs index 81a5721df36b1909824a681ef03848122ba24718..1ec01546ad2499aeca3b7c0bea4d34ee7efc0121 100644 --- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs +++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs @@ -164,7 +164,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper if (gearCurve == null) { return engineCurve; } - // TODO MK-2016-04-18: also combine the curves at the intersection-points of line segments! + // TODO mk-2016-04-18: also combine the curves at the intersection-points of line segments! var entries = gearCurve.FullLoadEntries.Concat(engineCurve.FullLoadEntries) .OrderBy(x => x.EngineSpeed) diff --git a/VectoCore/VectoCore/InputData/Reader/DrivingCycleDataReader.cs b/VectoCore/VectoCore/InputData/Reader/DrivingCycleDataReader.cs index 889ab1b3ea8f867dfd5d4aa55b7b1a6cfb185bd4..7ddcaab7d648dacea8dbbd9960179f7e16b9ac94 100644 --- a/VectoCore/VectoCore/InputData/Reader/DrivingCycleDataReader.cs +++ b/VectoCore/VectoCore/InputData/Reader/DrivingCycleDataReader.cs @@ -538,7 +538,6 @@ namespace TUGraz.VectoCore.InputData.Reader public static bool ValidateHeader(string[] header, bool throwExceptions = true) { - //todo mk-2016-02-15: check if vair_res, and vair_beta only when needed var allowedCols = new[] { Fields.Time, Fields.VehicleSpeed, @@ -586,7 +585,6 @@ namespace TUGraz.VectoCore.InputData.Reader public static bool ValidateHeader(string[] header, bool throwExceptions = true) { - //todo mk-2016-02-15: check if vair_res, and vair_beta only when needed var allowedCols = new[] { Fields.Time, Fields.VehicleSpeed, diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/GearData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/GearData.cs index 17a538f2cd792ceb5a6bdcf75a3af545a6d9c722..e864ad1198eb6fb5b501235fc00100fbfb382d85 100644 --- a/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/GearData.cs +++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/GearData.cs @@ -48,7 +48,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox [Required, Range(double.Epsilon, 25)] public double Ratio { get; internal set; } - public bool TorqueConverterActive { get; internal set; } // TODO: think about refactoring... + public bool TorqueConverterActive { get; internal set; } // TODO mk-2016-05-09: Refactor TorqueConverterActive Flag when implementing Torque Converter // public double AverageEfficiency { get; internal set; } } diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs index 5125e3db06a1b1f7cbc5b0fc7cdd98c6a4c5bebb..e6b30733af30e44e78c5127d77fd339d20c39e4c 100644 --- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs +++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs @@ -337,7 +337,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl var fc = ModelData.ConsumptionMap.GetFuelConsumption(CurrentState.EngineTorque, avgEngineSpeed, allowExtrapolation: (DataBus.ExecutionMode != ExecutionMode.Declaration)); - //todo (MK, 2015-11-11): calculate aux start stop correction when start stop functionality is implemented in v3 + //TODO mk-2015-11-11: calculate aux start stop correction var fcAux = fc; var fcWHTC = fcAux * ModelData.WHTCCorrectionFactor; diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs index e4534f04f7db7a650c76fc607f55924263785774..ddcf7e06248995ea94fab57f191d53999907543c 100644 --- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs +++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs @@ -541,7 +541,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl Case<ResponseDrivingCycleDistanceExceeded>(r => { if (!ds.IsEqual(r.MaxDistance)) { // distance has been reduced due to vehicle stop in coast/roll action => use brake action to get exactly to the stop-distance - // TODO: what if no gear is enaged (and we need driveline power to get to the stop-distance? + // TODO what if no gear is enaged (and we need driveline power to get to the stop-distance? response = Driver.DrivingActionBrake(absTime, ds, DriverStrategy.BrakeTrigger.NextTargetSpeed, gradient); } }). diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs index 227de3d7bd5a5134c13698479d51d575dcaa1a71..ed204fb4fcddc048de8a079c000e91115449c89a 100644 --- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs +++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs @@ -223,7 +223,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl } IResponse retVal; - // TODO: MQ 2016/03/10: investigate further the effects of having the condition angularvelocity != 0 + // TODO MQ 2016/03/10: investigate further the effects of having the condition angularvelocity != 0 if (ClutchClosed(absTime) /* && !angularVelocity.IsEqual(0) */) { retVal = RequestGearEngaged(absTime, dt, torque, angularVelocity, dryRun); } else { diff --git a/VectoCore/VectoCore/OutputData/IModalDataContainer.cs b/VectoCore/VectoCore/OutputData/IModalDataContainer.cs index 116ebdd358c5571d020f06c32ddd33d2f59506e5..6163dc235e2056783e408eeb7d7735138473c776 100644 --- a/VectoCore/VectoCore/OutputData/IModalDataContainer.cs +++ b/VectoCore/VectoCore/OutputData/IModalDataContainer.cs @@ -233,7 +233,7 @@ namespace TUGraz.VectoCore.OutputData public static WattSecond WorkTorqueConverter(this IModalDataContainer data) { - //TODO (MK, 2015-11-10): return torque converter work - this was currently not possible because torque converter is not implemented. + //TODO mk-2015-11-10: return torque converter work when TorqueConverter is implemented return 0.SI<WattSecond>(); } diff --git a/VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs b/VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs index 36e7d39a00a05688847b3d4dac757b0246bc9374..43338df247af0647f30dba0ae73c13ef6a95a3f1 100644 --- a/VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs +++ b/VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs @@ -296,18 +296,17 @@ namespace TUGraz.VectoCore.Tests.Integration.SimulationRuns @"TestData\job_1-Gear-Test-dist.vmod", testRowCount: false); } - // todo: add realistic FullLoadCurve private static GearboxData CreateGearboxData() { var ratios = new[] { 6.38, 4.63, 3.44, 2.59, 1.86, 1.35, 1, 0.76 }; - + return new GearboxData { Gears = ratios.Select((ratio, i) => Tuple.Create((uint)i, new GearData { + // TODO mk-2016-05-09: add realistic FullLoadCurve for gearbox FullLoadCurve = FullLoadCurveReader.ReadFromFile(GearboxFullLoadCurveFile), - LossMap = - TransmissionLossMap.ReadFromFile(GearboxLossMap, ratio, string.Format("Gear {0}", i)), + LossMap = TransmissionLossMap.ReadFromFile(GearboxLossMap, ratio, string.Format("Gear {0}", i)), Ratio = ratio, ShiftPolygon = ShiftPolygonReader.ReadFromFile(GearboxShiftPolygonFile) }))