diff --git a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
index 2f4f41999a2b25a96fbde71eba1faa5e8b4f8f99..98bfc64763ee494c8ee68aaaaf03348216655628 100644
--- a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
+++ b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
@@ -88,7 +88,8 @@ namespace TUGraz.VectoCore.Models.Declaration
/// </summary>
public static Kilogram GetPayloadForTrailerWeight(Kilogram grossVehicleWeight, Kilogram curbWeight, bool lowLoading)
{
- return Payloads.LookupTrailer(grossVehicleWeight, curbWeight) / (lowLoading ? 7.5 : 1);
+ return (Payloads.LookupTrailer(grossVehicleWeight, curbWeight) / (lowLoading ? 7.5 : 1)).LimitTo(0.SI<Kilogram>(),
+ grossVehicleWeight - curbWeight);
}
public static int PoweredAxle()
diff --git a/VectoCore/VectoCore/Models/Declaration/Payloads.cs b/VectoCore/VectoCore/Models/Declaration/Payloads.cs
index 1203a2743e97da58e26745287bd0808b86a2d8b6..0eb13d39a771cbffd0a3bb723b517d3d3fada781 100644
--- a/VectoCore/VectoCore/Models/Declaration/Payloads.cs
+++ b/VectoCore/VectoCore/Models/Declaration/Payloads.cs
@@ -29,72 +29,72 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
-using System;
-using System.Data;
-using System.Linq;
-using TUGraz.VectoCommon.Utils;
-using TUGraz.VectoCore.Utils;
-
-namespace TUGraz.VectoCore.Models.Declaration
-{
- public sealed class Payloads : LookupData<Kilogram, Payloads.PayloadEntry>
- {
- protected override string ResourceId
- {
- get { return DeclarationData.DeclarationDataResourcePrefix + ".Payloads.csv"; }
- }
-
- protected override string ErrorMessage
- {
- get { throw new InvalidOperationException("ErrorMessage not applicable."); }
- }
-
- public Kilogram Lookup10Percent(Kilogram grossVehicleWeight)
- {
- var section = Data.GetSection(d => d.Key > grossVehicleWeight);
- return VectoMath.Interpolate(section.Item1.Key, section.Item2.Key,
- section.Item1.Value.Payload10Percent, section.Item2.Value.Payload10Percent,
- grossVehicleWeight);
- }
-
- public Kilogram Lookup50Percent(Kilogram grossVehicleWeight)
- {
- var section = Data.GetSection(d => d.Key > grossVehicleWeight);
- return VectoMath.Interpolate(section.Item1.Key, section.Item2.Key,
- section.Item1.Value.Payload50Percent, section.Item2.Value.Payload50Percent,
- grossVehicleWeight);
- }
-
- public Kilogram Lookup75Percent(Kilogram grossVehicleWeight)
- {
- var section = Data.GetSection(d => d.Key > grossVehicleWeight);
- return VectoMath.Interpolate(section.Item1.Key, section.Item2.Key,
- section.Item1.Value.Payload75Percent, section.Item2.Value.Payload75Percent,
- grossVehicleWeight);
- }
-
- public Kilogram LookupTrailer(Kilogram grossVehicleWeight, Kilogram curbWeight)
- {
- return 0.75 * (grossVehicleWeight - curbWeight);
- }
-
- protected override void ParseData(DataTable table)
- {
- Data = table.Rows.Cast<DataRow>()
- .ToDictionary(
- kv => kv.ParseDouble("grossvehicleweight").SI<Kilogram>(),
- kv => new PayloadEntry {
- Payload10Percent = kv.ParseDouble("payload10%").SI<Kilogram>(),
- Payload50Percent = kv.ParseDouble("payload50%").SI<Kilogram>(),
- Payload75Percent = kv.ParseDouble("payload75%").SI<Kilogram>()
- });
- }
-
- public sealed class PayloadEntry
- {
- public Kilogram Payload10Percent;
- public Kilogram Payload50Percent;
- public Kilogram Payload75Percent;
- }
- }
+using System;
+using System.Data;
+using System.Linq;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Utils;
+
+namespace TUGraz.VectoCore.Models.Declaration
+{
+ public sealed class Payloads : LookupData<Kilogram, Payloads.PayloadEntry>
+ {
+ protected override string ResourceId
+ {
+ get { return DeclarationData.DeclarationDataResourcePrefix + ".Payloads.csv"; }
+ }
+
+ protected override string ErrorMessage
+ {
+ get { throw new InvalidOperationException("ErrorMessage not applicable."); }
+ }
+
+ public Kilogram Lookup10Percent(Kilogram grossVehicleWeight)
+ {
+ var section = Data.GetSection(d => d.Key > grossVehicleWeight);
+ return VectoMath.Interpolate(section.Item1.Key, section.Item2.Key,
+ section.Item1.Value.Payload10Percent, section.Item2.Value.Payload10Percent,
+ grossVehicleWeight);
+ }
+
+ public Kilogram Lookup50Percent(Kilogram grossVehicleWeight)
+ {
+ var section = Data.GetSection(d => d.Key > grossVehicleWeight);
+ return VectoMath.Interpolate(section.Item1.Key, section.Item2.Key,
+ section.Item1.Value.Payload50Percent, section.Item2.Value.Payload50Percent,
+ grossVehicleWeight);
+ }
+
+ public Kilogram Lookup75Percent(Kilogram grossVehicleWeight)
+ {
+ var section = Data.GetSection(d => d.Key > grossVehicleWeight);
+ return VectoMath.Interpolate(section.Item1.Key, section.Item2.Key,
+ section.Item1.Value.Payload75Percent, section.Item2.Value.Payload75Percent,
+ grossVehicleWeight);
+ }
+
+ public Kilogram LookupTrailer(Kilogram grossVehicleWeight, Kilogram curbWeight)
+ {
+ return 0.75 * (grossVehicleWeight - curbWeight);
+ }
+
+ protected override void ParseData(DataTable table)
+ {
+ Data = table.Rows.Cast<DataRow>()
+ .ToDictionary(
+ kv => kv.ParseDouble("grossvehicleweight").SI<Kilogram>(),
+ kv => new PayloadEntry {
+ Payload10Percent = kv.ParseDouble("payload10%").SI<Kilogram>(),
+ Payload50Percent = kv.ParseDouble("payload50%").SI<Kilogram>(),
+ Payload75Percent = kv.ParseDouble("payload75%").SI<Kilogram>()
+ });
+ }
+
+ public sealed class PayloadEntry
+ {
+ public Kilogram Payload10Percent;
+ public Kilogram Payload50Percent;
+ public Kilogram Payload75Percent;
+ }
+ }
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/Declaration/Segments.cs b/VectoCore/VectoCore/Models/Declaration/Segments.cs
index f070c9e29b1c41c2d2131dc48e2165dbcc551461..dcd94bade05daea51c1aa2b70af60de8bcbb4aad 100644
--- a/VectoCore/VectoCore/Models/Declaration/Segments.cs
+++ b/VectoCore/VectoCore/Models/Declaration/Segments.cs
@@ -210,12 +210,13 @@ namespace TUGraz.VectoCore.Models.Declaration
trailers.Sum(t => t.TrailerCurbWeight).DefaultIfNull(0);
var payloads = row.Field<string>(missionType.ToString()).Split('/');
+ var vehicleWeight = curbWeight + body.CurbWeight;
Kilogram refLoad, lowLoad = 0.SI<Kilogram>();
if (payloads.Length == 2) {
- lowLoad = GetLoading(payloads[0], grossVehicleWeight, trailers, true);
- refLoad = GetLoading(payloads[1], grossVehicleWeight, trailers, false);
+ lowLoad = GetLoading(payloads[0], grossVehicleWeight, vehicleWeight, trailers, true);
+ refLoad = GetLoading(payloads[1], grossVehicleWeight, vehicleWeight, trailers, false);
} else {
- refLoad = GetLoading(row.Field<string>(missionType.ToString()), grossVehicleWeight, trailers, false);
+ refLoad = GetLoading(row.Field<string>(missionType.ToString()), grossVehicleWeight, vehicleWeight, trailers, false);
}
refLoad = refLoad.LimitTo(0.SI<Kilogram>(), maxLoad);
@@ -242,15 +243,17 @@ namespace TUGraz.VectoCore.Models.Declaration
return missions.ToArray();
}
- private static Kilogram GetLoading(string payloadStr, Kilogram grossVehicleWeight,
+ private static Kilogram GetLoading(string payloadStr, Kilogram grossVehicleWeight, Kilogram vehicleWeight,
IEnumerable<MissionTrailer> trailers, bool lowLoading)
{
var refLoadValue = payloadStr.ToDouble(double.NaN);
if (double.IsNaN(refLoadValue)) {
- return DeclarationData.GetPayloadForGrossVehicleWeight(grossVehicleWeight, payloadStr) +
- trailers.Sum(
- t => DeclarationData.GetPayloadForTrailerWeight(t.TrailerGrossVehicleWeight, t.TrailerCurbWeight, lowLoading))
- .DefaultIfNull(0);
+ var vehiclePayload = DeclarationData.GetPayloadForGrossVehicleWeight(grossVehicleWeight, payloadStr)
+ .LimitTo(0.SI<Kilogram>(), grossVehicleWeight - vehicleWeight);
+ var trailerPayload = trailers.Sum(
+ t => DeclarationData.GetPayloadForTrailerWeight(t.TrailerGrossVehicleWeight, t.TrailerCurbWeight, lowLoading))
+ .DefaultIfNull(0);
+ return vehiclePayload + trailerPayload;
}
return refLoadValue.SI<Kilogram>();
}
diff --git a/VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs b/VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs
index 6cd925541c89a17dc27b2294757601f6319de202..d1f2dcec0a15f2d063463da5ea7bb693310932ba 100644
--- a/VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs
@@ -29,207 +29,207 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using TUGraz.VectoCommon.Models;
-using TUGraz.VectoCommon.Utils;
-using TUGraz.VectoCore.Configuration;
-using TUGraz.VectoCore.InputData.Reader;
-using TUGraz.VectoCore.InputData.Reader.ComponentData;
-using TUGraz.VectoCore.Models.Declaration;
-using TUGraz.VectoCore.Models.Simulation.Data;
-using TUGraz.VectoCore.Models.Simulation.Impl;
-using TUGraz.VectoCore.Models.SimulationComponent.Data;
-using TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox;
-using TUGraz.VectoCore.Models.SimulationComponent.Impl;
-using TUGraz.VectoCore.OutputData;
-using TUGraz.VectoCore.OutputData.FileIO;
-using TUGraz.VectoCore.Tests.Utils;
-using TUGraz.VectoCore.Utils;
-using Wheels = TUGraz.VectoCore.Models.SimulationComponent.Impl.Wheels;
-
-namespace TUGraz.VectoCore.Tests.Integration
-{
- public class CoachPowerTrain
- {
- public const string AccelerationFile = @"TestData\Components\Truck.vacc";
- public const string EngineFile = @"TestData\Components\24t Coach.veng";
- public const string EngineFileHigh = @"TestData\Components\24t Coach_high.veng";
- public const string AxleGearLossMap = @"TestData\Components\Axle.vtlm";
- public const string GearboxIndirectLoss = @"TestData\Components\Indirect Gear.vtlm";
- public const string GearboxDirectLoss = @"TestData\Components\Direct Gear.vtlm";
- public const string GearboxShiftPolygonFile = @"TestData\Components\ShiftPolygons.vgbs";
- //public const string GearboxFullLoadCurveFile = @"TestData\Components\Gearbox.vfld";
-
- public static VectoRun CreateEngineeringRun(DrivingCycleData cycleData, string modFileName,
- bool overspeed = false, KilogramSquareMeter gearBoxInertia = null, bool highEnginePower = true)
- {
- var container = CreatePowerTrain(cycleData, Path.GetFileNameWithoutExtension(modFileName), overspeed, gearBoxInertia,
- highEnginePower);
- return new DistanceRun(container);
- }
-
- public static VehicleContainer CreatePowerTrain(DrivingCycleData cycleData, string modFileName, bool overspeed = false,
- KilogramSquareMeter gearBoxInertia = null, bool engineHighPower = true)
- {
- var fileWriter = new FileOutputWriter(modFileName);
- var modData = new ModalDataContainer(modFileName, FuelType.DieselCI, fileWriter) { WriteModalResults = true };
- var container = new VehicleContainer(ExecutionMode.Engineering, modData) {
- RunData = new VectoRunData { JobName = modFileName, Cycle = cycleData }
- };
-
- var gearboxData = CreateGearboxData();
- var engineData = MockSimulationDataFactory.CreateEngineDataFromFile(engineHighPower ? EngineFileHigh : EngineFile, gearboxData.Gears.Count);
- var axleGearData = CreateAxleGearData();
- if (gearBoxInertia != null) {
- gearboxData.Inertia = gearBoxInertia;
- }
-
- var vehicleData = CreateVehicleData(3300.SI<Kilogram>());
- var driverData = CreateDriverData(AccelerationFile, overspeed);
-
- var cycle = new DistanceBasedDrivingCycle(container, cycleData);
- var engine = new CombustionEngine(container, engineData);
- var clutch = new Clutch(container, engineData);
- var airDragData = CreateAirdragData();
-
- var runData = new VectoRunData() {
- VehicleData = vehicleData,
- AxleGearData = axleGearData,
- GearboxData = gearboxData,
- EngineData = engineData,
- AirdragData = airDragData
- };
-
- var tmp = cycle.AddComponent(new Driver(container, driverData, new DefaultDriverStrategy()))
- .AddComponent(new Vehicle(container, vehicleData, airDragData))
- .AddComponent(new Wheels(container, vehicleData.DynamicTyreRadius, vehicleData.WheelsInertia))
- .AddComponent(new Brakes(container))
- .AddComponent(new AxleGear(container, axleGearData))
- .AddComponent(new DummyRetarder(container))
- .AddComponent(new Gearbox(container, new AMTShiftStrategy(runData, container), runData))
- .AddComponent(clutch)
- .AddComponent(engine);
-
- var aux = new EngineAuxiliary(container);
- aux.AddConstant("ZERO", 0.SI<Watt>());
- container.ModalData.AddAuxiliary("ZERO");
-
- engine.Connect(aux.Port());
-
- return container;
- }
-
- 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 {
- //MaxTorque = 2300.SI<NewtonMeter>(),
- LossMap = ratio.IsEqual(1)
- ? TransmissionLossMapReader.ReadFromFile(GearboxIndirectLoss, ratio, string.Format("Gear {0}", i))
- : TransmissionLossMapReader.ReadFromFile(GearboxDirectLoss, ratio, string.Format("Gear {0}", i)),
- Ratio = ratio,
- ShiftPolygon = ShiftPolygonReader.ReadFromFile(GearboxShiftPolygonFile)
- }))
- .ToDictionary(k => k.Item1 + 1, v => v.Item2),
- ShiftTime = 2.SI<Second>(),
- Inertia = 0.SI<KilogramSquareMeter>(),
- TractionInterruption = 1.SI<Second>(),
- StartSpeed = 2.SI<MeterPerSecond>(),
- StartAcceleration = 0.6.SI<MeterPerSquareSecond>(),
- StartTorqueReserve = 0.2,
- TorqueReserve = 0.2,
- DownshiftAfterUpshiftDelay = DeclarationData.Gearbox.DownshiftAfterUpshiftDelay,
- UpshiftAfterDownshiftDelay = DeclarationData.Gearbox.UpshiftAfterDownshiftDelay,
- UpshiftMinAcceleration = DeclarationData.Gearbox.UpshiftMinAcceleration
- };
- }
-
- private static AxleGearData CreateAxleGearData()
- {
- const double ratio = 3.240355;
- return new AxleGearData {
- AxleGear = new GearData {
- Ratio = ratio,
- LossMap = TransmissionLossMapReader.ReadFromFile(AxleGearLossMap, ratio, "AxleGear")
- }
- };
- }
-
- private static VehicleData CreateVehicleData(Kilogram loading)
- {
- var axles = new List<Axle> {
- new Axle {
- AxleWeightShare = 0.4375,
- Inertia = 21.66667.SI<KilogramSquareMeter>(),
- RollResistanceCoefficient = 0.0055,
- TwinTyres = false,
- TyreTestLoad = 62538.75.SI<Newton>()
- },
- new Axle {
- AxleWeightShare = 0.375,
- Inertia = 10.83333.SI<KilogramSquareMeter>(),
- RollResistanceCoefficient = 0.0065,
- TwinTyres = true,
- TyreTestLoad = 52532.55.SI<Newton>()
- },
- new Axle {
- AxleWeightShare = 0.1875,
- Inertia = 21.66667.SI<KilogramSquareMeter>(),
- RollResistanceCoefficient = 0.0055,
- TwinTyres = false,
- TyreTestLoad = 62538.75.SI<Newton>()
- }
- };
- return new VehicleData {
- AxleConfiguration = AxleConfiguration.AxleConfig_6x2,
- //AerodynamicDragAera = 3.2634.SI<SquareMeter>(),
- //CrossWindCorrectionMode = CrossWindCorrectionMode.NoCorrection,
-
- CurbWeight = 15700.SI<Kilogram>(),
- Loading = loading,
- DynamicTyreRadius = 0.52.SI<Meter>(),
- AxleData = axles,
- SavedInDeclarationMode = false
- };
- }
-
- private static AirdragData CreateAirdragData()
- {
- return new AirdragData() {
- CrossWindCorrectionCurve =
- new CrosswindCorrectionCdxALookup(3.2634.SI<SquareMeter>(), CrossWindCorrectionCurveReader.GetNoCorrectionCurve(3.2634.SI<SquareMeter>()),
- CrossWindCorrectionMode.NoCorrection),
- };
- }
-
- private static DriverData CreateDriverData(string accelerationFile, bool overspeed = false)
- {
- return new DriverData {
- AccelerationCurve = AccelerationCurveReader.ReadFromFile(accelerationFile),
- LookAheadCoasting = new DriverData.LACData {
- Enabled = true,
- MinSpeed = 50.KMPHtoMeterPerSecond(),
- //Deceleration = -0.5.SI<MeterPerSquareSecond>()
- LookAheadDistanceFactor = DeclarationData.Driver.LookAhead.LookAheadDistanceFactor,
- LookAheadDecisionFactor = new LACDecisionFactor()
- },
- OverSpeedEcoRoll = overspeed
- ? new DriverData.OverSpeedEcoRollData {
- Mode = DriverMode.Overspeed,
- MinSpeed = 50.KMPHtoMeterPerSecond(),
- OverSpeed = 5.KMPHtoMeterPerSecond()
- }
- : new DriverData.OverSpeedEcoRollData {
- Mode = DriverMode.Off
- },
- };
- }
- }
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
+using TUGraz.VectoCore.InputData.Reader;
+using TUGraz.VectoCore.InputData.Reader.ComponentData;
+using TUGraz.VectoCore.Models.Declaration;
+using TUGraz.VectoCore.Models.Simulation.Data;
+using TUGraz.VectoCore.Models.Simulation.Impl;
+using TUGraz.VectoCore.Models.SimulationComponent.Data;
+using TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox;
+using TUGraz.VectoCore.Models.SimulationComponent.Impl;
+using TUGraz.VectoCore.OutputData;
+using TUGraz.VectoCore.OutputData.FileIO;
+using TUGraz.VectoCore.Tests.Utils;
+using TUGraz.VectoCore.Utils;
+using Wheels = TUGraz.VectoCore.Models.SimulationComponent.Impl.Wheels;
+
+namespace TUGraz.VectoCore.Tests.Integration
+{
+ public class CoachPowerTrain
+ {
+ public const string AccelerationFile = @"TestData\Components\Truck.vacc";
+ public const string EngineFile = @"TestData\Components\24t Coach.veng";
+ public const string EngineFileHigh = @"TestData\Components\24t Coach_high.veng";
+ public const string AxleGearLossMap = @"TestData\Components\Axle.vtlm";
+ public const string GearboxIndirectLoss = @"TestData\Components\Indirect Gear.vtlm";
+ public const string GearboxDirectLoss = @"TestData\Components\Direct Gear.vtlm";
+ public const string GearboxShiftPolygonFile = @"TestData\Components\ShiftPolygons.vgbs";
+ //public const string GearboxFullLoadCurveFile = @"TestData\Components\Gearbox.vfld";
+
+ public static VectoRun CreateEngineeringRun(DrivingCycleData cycleData, string modFileName,
+ bool overspeed = false, KilogramSquareMeter gearBoxInertia = null, bool highEnginePower = true)
+ {
+ var container = CreatePowerTrain(cycleData, Path.GetFileNameWithoutExtension(modFileName), overspeed, gearBoxInertia,
+ highEnginePower);
+ return new DistanceRun(container);
+ }
+
+ public static VehicleContainer CreatePowerTrain(DrivingCycleData cycleData, string modFileName, bool overspeed = false,
+ KilogramSquareMeter gearBoxInertia = null, bool engineHighPower = true)
+ {
+ var fileWriter = new FileOutputWriter(modFileName);
+ var modData = new ModalDataContainer(modFileName, FuelType.DieselCI, fileWriter) { WriteModalResults = true };
+ var container = new VehicleContainer(ExecutionMode.Engineering, modData) {
+ RunData = new VectoRunData { JobName = modFileName, Cycle = cycleData }
+ };
+
+ var gearboxData = CreateGearboxData();
+ var engineData = MockSimulationDataFactory.CreateEngineDataFromFile(engineHighPower ? EngineFileHigh : EngineFile, gearboxData.Gears.Count);
+ var axleGearData = CreateAxleGearData();
+ if (gearBoxInertia != null) {
+ gearboxData.Inertia = gearBoxInertia;
+ }
+
+ var vehicleData = CreateVehicleData(3300.SI<Kilogram>());
+ var driverData = CreateDriverData(AccelerationFile, overspeed);
+
+ var cycle = new DistanceBasedDrivingCycle(container, cycleData);
+ var engine = new CombustionEngine(container, engineData);
+ var clutch = new Clutch(container, engineData);
+ var airDragData = CreateAirdragData();
+
+ var runData = new VectoRunData() {
+ VehicleData = vehicleData,
+ AxleGearData = axleGearData,
+ GearboxData = gearboxData,
+ EngineData = engineData,
+ AirdragData = airDragData
+ };
+
+ var tmp = cycle.AddComponent(new Driver(container, driverData, new DefaultDriverStrategy()))
+ .AddComponent(new Vehicle(container, vehicleData, airDragData))
+ .AddComponent(new Wheels(container, vehicleData.DynamicTyreRadius, vehicleData.WheelsInertia))
+ .AddComponent(new Brakes(container))
+ .AddComponent(new AxleGear(container, axleGearData))
+ .AddComponent(new DummyRetarder(container))
+ .AddComponent(new Gearbox(container, new AMTShiftStrategy(runData, container), runData))
+ .AddComponent(clutch)
+ .AddComponent(engine);
+
+ var aux = new EngineAuxiliary(container);
+ aux.AddConstant("ZERO", 0.SI<Watt>());
+ container.ModalData.AddAuxiliary("ZERO");
+
+ engine.Connect(aux.Port());
+
+ return container;
+ }
+
+ 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 {
+ //MaxTorque = 2300.SI<NewtonMeter>(),
+ LossMap = ratio.IsEqual(1)
+ ? TransmissionLossMapReader.ReadFromFile(GearboxIndirectLoss, ratio, string.Format("Gear {0}", i))
+ : TransmissionLossMapReader.ReadFromFile(GearboxDirectLoss, ratio, string.Format("Gear {0}", i)),
+ Ratio = ratio,
+ ShiftPolygon = ShiftPolygonReader.ReadFromFile(GearboxShiftPolygonFile)
+ }))
+ .ToDictionary(k => k.Item1 + 1, v => v.Item2),
+ ShiftTime = 2.SI<Second>(),
+ Inertia = 0.SI<KilogramSquareMeter>(),
+ TractionInterruption = 1.SI<Second>(),
+ StartSpeed = 2.SI<MeterPerSecond>(),
+ StartAcceleration = 0.6.SI<MeterPerSquareSecond>(),
+ StartTorqueReserve = 0.2,
+ TorqueReserve = 0.2,
+ DownshiftAfterUpshiftDelay = DeclarationData.Gearbox.DownshiftAfterUpshiftDelay,
+ UpshiftAfterDownshiftDelay = DeclarationData.Gearbox.UpshiftAfterDownshiftDelay,
+ UpshiftMinAcceleration = DeclarationData.Gearbox.UpshiftMinAcceleration
+ };
+ }
+
+ private static AxleGearData CreateAxleGearData()
+ {
+ const double ratio = 3.240355;
+ return new AxleGearData {
+ AxleGear = new GearData {
+ Ratio = ratio,
+ LossMap = TransmissionLossMapReader.ReadFromFile(AxleGearLossMap, ratio, "AxleGear")
+ }
+ };
+ }
+
+ private static VehicleData CreateVehicleData(Kilogram loading)
+ {
+ var axles = new List<Axle> {
+ new Axle {
+ AxleWeightShare = 0.4375,
+ Inertia = 21.66667.SI<KilogramSquareMeter>(),
+ RollResistanceCoefficient = 0.0055,
+ TwinTyres = false,
+ TyreTestLoad = 62538.75.SI<Newton>()
+ },
+ new Axle {
+ AxleWeightShare = 0.375,
+ Inertia = 10.83333.SI<KilogramSquareMeter>(),
+ RollResistanceCoefficient = 0.0065,
+ TwinTyres = true,
+ TyreTestLoad = 52532.55.SI<Newton>()
+ },
+ new Axle {
+ AxleWeightShare = 0.1875,
+ Inertia = 21.66667.SI<KilogramSquareMeter>(),
+ RollResistanceCoefficient = 0.0055,
+ TwinTyres = false,
+ TyreTestLoad = 62538.75.SI<Newton>()
+ }
+ };
+ return new VehicleData {
+ AxleConfiguration = AxleConfiguration.AxleConfig_6x2,
+ //AerodynamicDragAera = 3.2634.SI<SquareMeter>(),
+ //CrossWindCorrectionMode = CrossWindCorrectionMode.NoCorrection,
+
+ CurbWeight = 15700.SI<Kilogram>(),
+ Loading = loading,
+ DynamicTyreRadius = 0.52.SI<Meter>(),
+ AxleData = axles,
+ SavedInDeclarationMode = false
+ };
+ }
+
+ private static AirdragData CreateAirdragData()
+ {
+ return new AirdragData() {
+ CrossWindCorrectionCurve =
+ new CrosswindCorrectionCdxALookup(3.2634.SI<SquareMeter>(), CrossWindCorrectionCurveReader.GetNoCorrectionCurve(3.2634.SI<SquareMeter>()),
+ CrossWindCorrectionMode.NoCorrection),
+ };
+ }
+
+ private static DriverData CreateDriverData(string accelerationFile, bool overspeed = false)
+ {
+ return new DriverData {
+ AccelerationCurve = AccelerationCurveReader.ReadFromFile(accelerationFile),
+ LookAheadCoasting = new DriverData.LACData {
+ Enabled = true,
+ MinSpeed = 50.KMPHtoMeterPerSecond(),
+ //Deceleration = -0.5.SI<MeterPerSquareSecond>()
+ LookAheadDistanceFactor = DeclarationData.Driver.LookAhead.LookAheadDistanceFactor,
+ LookAheadDecisionFactor = new LACDecisionFactor()
+ },
+ OverSpeedEcoRoll = overspeed
+ ? new DriverData.OverSpeedEcoRollData {
+ Mode = DriverMode.Overspeed,
+ MinSpeed = 50.KMPHtoMeterPerSecond(),
+ OverSpeed = 5.KMPHtoMeterPerSecond()
+ }
+ : new DriverData.OverSpeedEcoRollData {
+ Mode = DriverMode.Off
+ },
+ };
+ }
+ }
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
index ffb5f6d5dfca18bda17ec7e5907414defe6cc607..f9078ff445a13223b5100f001e12e810da969e44 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
@@ -269,8 +269,9 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
public void CrossWindAreaCdxANotSet_Other()
{
foreach (var correctionMode in EnumHelper.GetValues<CrossWindCorrectionMode>()) {
- if (correctionMode == CrossWindCorrectionMode.DeclarationModeCorrection)
+ if (correctionMode == CrossWindCorrectionMode.DeclarationModeCorrection) {
continue;
+ }
var airDrag = new AirdragData {
CrossWindCorrectionMode = correctionMode,
@@ -526,11 +527,11 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
public void SegmentWeightOutOfRange4X2(double weight)
{
AssertHelper.Exception<VectoException>(() =>
- DeclarationData.Segments.Lookup(
- VehicleCategory.RigidTruck,
- AxleConfiguration.AxleConfig_4x2,
- weight.SI<Kilogram>(),
- 0.SI<Kilogram>()),
+ DeclarationData.Segments.Lookup(
+ VehicleCategory.RigidTruck,
+ AxleConfiguration.AxleConfig_4x2,
+ weight.SI<Kilogram>(),
+ 0.SI<Kilogram>()),
"Gross vehicle mass must be greater than 7.5 tons");
}
@@ -543,11 +544,11 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
public void SegmentWeightOutOfRange4X4(double weight)
{
AssertHelper.Exception<VectoException>(() =>
- DeclarationData.Segments.Lookup(
- VehicleCategory.RigidTruck,
- AxleConfiguration.AxleConfig_4x4,
- weight.SI<Kilogram>(),
- 0.SI<Kilogram>()),
+ DeclarationData.Segments.Lookup(
+ VehicleCategory.RigidTruck,
+ AxleConfiguration.AxleConfig_4x4,
+ weight.SI<Kilogram>(),
+ 0.SI<Kilogram>()),
"Gross vehicle mass must be greater than 7.5 tons");
}
@@ -775,7 +776,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
trailerCurbWeight: new[] { 3400.0 },
trailerType: new[] { TrailerType.T1 },
lowLoad: 1306.8235,
- refLoad: 9813.2353,
+ refLoad: 9475,
trailerGrossVehicleWeight: new[] { 10500.0 },
deltaCdA: 1.3,
maxLoad: 11250);
@@ -813,6 +814,80 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
maxLoad: 4150);
}
+
+ /// <summary>
+ /// trailer in longhaul, always pc formula
+ /// </summary>
+ [TestCase]
+ public void Segment2TestHeavy()
+ {
+ var vehicleData = new {
+ VehicleCategory = VehicleCategory.RigidTruck,
+ AxleConfiguration = AxleConfiguration.AxleConfig_4x2,
+ GrossVehicleMassRating = 11990.SI<Kilogram>(),
+ CurbWeight = 9500.SI<Kilogram>()
+ };
+
+ var segment = DeclarationData.Segments.Lookup(vehicleData.VehicleCategory, vehicleData.AxleConfiguration,
+ vehicleData.GrossVehicleMassRating, vehicleData.CurbWeight);
+
+ Assert.AreEqual(VehicleClass.Class2, segment.VehicleClass);
+
+ var data = AccelerationCurveReader.ReadFromStream(segment.AccelerationFile);
+ TestAcceleration(data);
+
+ Assert.AreEqual(3, segment.Missions.Length);
+
+ AssertMission(segment.Missions[0],
+ vehicleData: vehicleData,
+ missionType: MissionType.LongHaul,
+ cosswindCorrection: "RigidTrailer",
+ axleWeightDistribution: new[] { 0.225, 0.325 },
+ trailerAxleWeightDistribution: new[] { 0.45 },
+ trailerAxleCount: new[] { 2 },
+ bodyCurbWeight: 1900,
+ trailerCurbWeight: new[] { 3400.0 },
+ trailerType: new[] { TrailerType.T1 },
+ lowLoad: 1300,
+ refLoad: 5915,
+ trailerGrossVehicleWeight: new[] { 10500.0 },
+ deltaCdA: 1.3,
+ maxLoad: 7690);
+
+ AssertMission(segment.Missions[1],
+ vehicleData: vehicleData,
+ missionType: MissionType.RegionalDelivery,
+ cosswindCorrection: "RigidSolo",
+ axleWeightDistribution: new[] { 0.45, 0.55 },
+ trailerAxleWeightDistribution: new double[] { },
+ trailerAxleCount: new int[] { },
+ bodyCurbWeight: 1900,
+ trailerCurbWeight: new double[] { },
+ trailerType: new TrailerType[] { },
+ lowLoad: 590,
+ refLoad: 590,
+ trailerGrossVehicleWeight: new double[] { },
+ deltaCdA: 0,
+ maxLoad: 590);
+
+ AssertMission(segment.Missions[2],
+ vehicleData: vehicleData,
+ missionType: MissionType.UrbanDelivery,
+ cosswindCorrection: "RigidSolo",
+ axleWeightDistribution: new[] { 0.45, 0.55 },
+ trailerAxleWeightDistribution: new double[] { },
+ trailerAxleCount: new int[] { },
+ bodyCurbWeight: 1900,
+ trailerCurbWeight: new double[] { },
+ trailerType: new TrailerType[] { },
+ lowLoad: 590,
+ refLoad: 590,
+ trailerGrossVehicleWeight: new double[] { },
+ deltaCdA: 0,
+ maxLoad: 590);
+ }
+
+
/// <summary>
/// normal pc formula, no trailer
/// </summary>