Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit 6aca45b6 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

renaming field (typo), correcting xml type name, ignore calculation of...

renaming field (typo), correcting xml type name, ignore calculation of veh-line for exempted vehicles, at gearbox: don't initialize gear if no strategy is set (testcontainer), at effshift: initialise at gearbox in testcontainer
parent 34f73ac8
No related branches found
No related tags found
No related merge requests found
...@@ -86,7 +86,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.Impl ...@@ -86,7 +86,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.Impl
{ {
public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.ENGINEERING_DEFINITONS_NAMESPACE_V10; public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.ENGINEERING_DEFINITONS_NAMESPACE_V10;
public new const string XSD_TYPE = "TorqueConverterComponentEngineeringType"; public new const string XSD_TYPE = "TorqueConverterDataEngineeringType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI, XSD_TYPE); public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI, XSD_TYPE);
......
...@@ -63,6 +63,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl ...@@ -63,6 +63,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
protected Exception InitException; protected Exception InitException;
public IVTPReport Report; public IVTPReport Report;
protected ShiftStrategyParameters GearshiftData;
public DeclarationVTPModeVectoRunDataFactory(IVTPDeclarationInputDataProvider ivtpProvider, IVTPReport report) : this( public DeclarationVTPModeVectoRunDataFactory(IVTPDeclarationInputDataProvider ivtpProvider, IVTPReport report) : this(
ivtpProvider.JobInputData, report) { } ivtpProvider.JobInputData, report) { }
...@@ -142,6 +143,9 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl ...@@ -142,6 +143,9 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
PTOTransmissionData = PTOTransmissionData =
Dao.CreatePTOTransmissionData(vehicle.Components.PTOTransmissionInputData); Dao.CreatePTOTransmissionData(vehicle.Components.PTOTransmissionInputData);
GearshiftData = Dao.CreateGearshiftData(
GearboxData.Type, AxlegearData.AxleGear.Ratio * (AngledriveData?.Angledrive.Ratio ?? 1.0), EngineData.IdleSpeed);
AuxVTP = CreateVTPAuxData(vehicle); AuxVTP = CreateVTPAuxData(vehicle);
} }
...@@ -224,6 +228,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl ...@@ -224,6 +228,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
JobName = JobInputData.Vehicle.VIN, JobName = JobInputData.Vehicle.VIN,
EngineData = EngineData, EngineData = EngineData,
GearboxData = GearboxData, GearboxData = GearboxData,
GearshiftParameters = GearshiftData,
AxleGearData = AxlegearData, AxleGearData = AxlegearData,
AngledriveData = AngledriveData, AngledriveData = AngledriveData,
VehicleData = Dao.CreateVehicleData( VehicleData = Dao.CreateVehicleData(
......
...@@ -137,10 +137,12 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl ...@@ -137,10 +137,12 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
Container.AbsTime = AbsTime; Container.AbsTime = AbsTime;
} }
} while (response is ResponseSuccess); } while (response is ResponseSuccess);
if (!GetContainer().RunData.Exempted) {
foreach (var fuel in GetContainer().RunData.EngineData.Fuels) { foreach (var fuel in GetContainer().RunData.EngineData.Fuels) {
// calculate vehicleline correction here in local thread context because writing sum-data and report afterwards is synchronized // calculate vehicleline correction here in local thread context because writing sum-data and report afterwards is synchronized
var cf = GetContainer().ModalData.VehicleLineCorrectionFactor(fuel.FuelData); var cf = GetContainer().ModalData.VehicleLineCorrectionFactor(fuel.FuelData);
} }
}
PostProcessingDone = true; PostProcessingDone = true;
} catch (VectoSimulationException vse) { } catch (VectoSimulationException vse) {
......
...@@ -128,9 +128,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl ...@@ -128,9 +128,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public override IResponse Initialize(NewtonMeter outTorque, PerSecond outAngularVelocity) public override IResponse Initialize(NewtonMeter outTorque, PerSecond outAngularVelocity)
{ {
if (CurrentState.Disengaged) { if (_strategy != null && CurrentState.Disengaged) {
Gear = _strategy?.InitGear(0.SI<Second>(), Constants.SimulationSettings.TargetTimeInterval, outTorque, Gear = _strategy.InitGear(0.SI<Second>(), Constants.SimulationSettings.TargetTimeInterval, outTorque,
outAngularVelocity) ?? 1; outAngularVelocity);
} }
var inAngularVelocity = 0.SI<PerSecond>(); var inAngularVelocity = 0.SI<PerSecond>();
var inTorque = 0.SI<NewtonMeter>(); var inTorque = 0.SI<NewtonMeter>();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment