Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit 793dabae authored by Harald Martini's avatar Harald Martini
Browse files

Use new dataadapter in DeclarationVTPModeVectoRunDataFactoryLorries,... 

Use new dataadapter in DeclarationVTPModeVectoRunDataFactoryLorries, DeclarationVTPModeVectoRunDataFactoryHeavyBusPrimary
parent 132b2d77
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactoryLorries.cs
+ 213
− 202
View file @ 793dabae
///*
//* This file is part of VECTO.
//*
//* Copyright © 2012-2019 European Union
//*
//* Developed by Graz University of Technology,
//* Institute of Internal Combustion Engines and Thermodynamics,
//* Institute of Technical Informatics
//*
//* VECTO is licensed under the EUPL, Version 1.1 or - as soon they will be approved
//* by the European Commission - subsequent versions of the EUPL (the "Licence");
//* You may not use VECTO except in compliance with the Licence.
//* You may obtain a copy of the Licence at:
//*
//* https://joinup.ec.europa.eu/community/eupl/og_page/eupl
//*
//* Unless required by applicable law or agreed to in writing, VECTO
//* distributed under the Licence is distributed on an "AS IS" basis,
//* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
//* See the Licence for the specific language governing permissions and
//* limitations under the Licence.
//*
//* Authors:
//* Stefan Hausberger, hausberger@ivt.tugraz.at, IVT, Graz University of Technology
//* Christian Kreiner, christian.kreiner@tugraz.at, ITI, Graz University of Technology
//* Michael Krisper, michael.krisper@tugraz.at, ITI, Graz University of Technology
//* Raphael Luz, luz@ivt.tugraz.at, IVT, Graz University of Technology
//* Markus Quaritsch, markus.quaritsch@tugraz.at, IVT, Graz University of Technology
//* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
//*/
//using System;
//using System.Collections.Generic;
//using System.Linq;
//using TUGraz.VectoCommon.Exceptions;
//using TUGraz.VectoCommon.InputData;
//using TUGraz.VectoCommon.Models;
//using TUGraz.VectoCommon.Utils;
//using TUGraz.VectoCore.Configuration;
//using TUGraz.VectoCore.InputData.Reader.ComponentData;
//using TUGraz.VectoCore.InputData.Reader.DataObjectAdapter;
//using TUGraz.VectoCore.Models.Declaration;
//using TUGraz.VectoCore.Models.Simulation.Data;
//using TUGraz.VectoCore.Models.SimulationComponent.Data;
//using TUGraz.VectoCore.OutputData;
//using DeclarationDataAdapterHeavyLorry = TUGraz.VectoCore.InputData.Reader.DataObjectAdapter.HeavyLorry.DeclarationDataAdapterHeavyLorry;
//namespace TUGraz.VectoCore.InputData.Reader.Impl
//{
// internal class DeclarationVTPModeVectoRunDataFactoryLorries : AbstractVTPModeVectoRunDataFactory
// {
// private DeclarationDataAdapterHeavyLorry _dao;
// public DeclarationVTPModeVectoRunDataFactoryLorries(IVTPDeclarationInputDataProvider ivtpProvider, IVTPReport report) : base(
// ivtpProvider.JobInputData, report)
// { }
// protected DeclarationVTPModeVectoRunDataFactoryLorries(IVTPDeclarationJobInputData job, IVTPReport report) : base(job, report)
// { }
// protected override IDeclarationDataAdapter Dao => _dao ?? (_dao = new DeclarationDataAdapterHeavyLorry());
// protected override void Initialize()
// {
// var vehicle = JobInputData.Vehicle;
// try {
// Segment = DeclarationData.TruckSegments.Lookup(
// vehicle.VehicleCategory,
// vehicle.AxleConfiguration,
// vehicle.GrossVehicleMassRating,
// vehicle.CurbMassChassis,
// vehicle.VocationalVehicle);
// } catch (VectoException) {
// _allowVocational = false;
// Segment = DeclarationData.TruckSegments.Lookup(
// vehicle.VehicleCategory,
// vehicle.AxleConfiguration,
// vehicle.GrossVehicleMassRating,
// vehicle.CurbMassChassis,
// false);
// }
// Driverdata = Dao.CreateDriverData();
// Driverdata.AccelerationCurve = AccelerationCurveReader.ReadFromStream(Segment.AccelerationFile);
// var tempVehicle = Dao.CreateVehicleData(
// vehicle, Segment, Segment.Missions.First(),
// Segment.Missions.First().Loadings.First(), _allowVocational);
// var vtpMission = Segment.VehicleClass.IsMediumLorry()
// ? DeclarationData.VTPMode.SelectedMissionMediumLorry
// : DeclarationData.VTPMode.SelectedMissionHeavyLorry;
// AirdragData = Dao.CreateAirdragData(
// vehicle.Components.AirdragInputData,
// Segment.Missions.First(), Segment);
// EngineData = Dao.CreateEngineData(
// vehicle, vehicle.Components.EngineInputData.EngineModes.First(),
// new Mission() { MissionType = vtpMission });
// AxlegearData = JobInputData.Vehicle.Components.GearboxInputData.DifferentialIncluded
// ? Dao.CreateDummyAxleGearData(JobInputData.Vehicle.Components.GearboxInputData)
// : Dao.CreateAxleGearData(vehicle.Components.AxleGearInputData);
// AngledriveData = Dao.CreateAngledriveData(vehicle.Components.AngledriveInputData);
// GearboxData = Dao.CreateGearboxData(
// vehicle, new VectoRunData() { EngineData = EngineData, AxleGearData = AxlegearData, VehicleData = tempVehicle },
// null);
// RetarderData = Dao.CreateRetarderData(vehicle.Components.RetarderInputData);
// PTOTransmissionData =
// Dao.CreatePTOTransmissionData(vehicle.Components.PTOTransmissionInputData);
// GearshiftData = Dao.CreateGearshiftData(
// GearboxData, AxlegearData.AxleGear.Ratio * (AngledriveData?.Angledrive.Ratio ?? 1.0), EngineData.IdleSpeed);
// AuxVTP = CreateVTPAuxData(vehicle);
// }
// protected override IEnumerable<VectoRunData.AuxData> GetAuxiliaryData(MissionType missionType)
// {
// return Dao.CreateAuxiliaryData(
// JobInputData.Vehicle.Components.AuxiliaryInputData,
// JobInputData.Vehicle.Components.BusAuxiliaries,
// missionType,
// Segment.VehicleClass, JobInputData.Vehicle.Length,
// JobInputData.Vehicle.Components.AxleWheels.NumSteeredAxles);
// }
// protected virtual List<VectoRunData.AuxData> CreateVTPAuxData(IVehicleDeclarationInputData vehicle)
// {
// var numSteered = vehicle.Components.AxleWheels.NumSteeredAxles;
// var auxRD = Dao.CreateAuxiliaryData(
// vehicle.Components.AuxiliaryInputData, vehicle.Components.BusAuxiliaries, MissionType.RegionalDelivery, Segment.VehicleClass, vehicle.Length, numSteered)
// .ToList();
// foreach (var entry in auxRD) {
// entry.MissionType = MissionType.RegionalDelivery;
// }
// var auxLH = Dao.CreateAuxiliaryData(
// vehicle.Components.AuxiliaryInputData, vehicle.Components.BusAuxiliaries, MissionType.LongHaul, Segment.VehicleClass, vehicle.Length, numSteered)
// .ToList();
// foreach (var entry in auxLH) {
// entry.MissionType = MissionType.LongHaul;
// }
// var auxUD = Dao.CreateAuxiliaryData(
// vehicle.Components.AuxiliaryInputData, vehicle.Components.BusAuxiliaries, MissionType.UrbanDelivery, Segment.VehicleClass, vehicle.Length, numSteered)
// .ToList();
// foreach (var entry in auxUD) {
// entry.MissionType = MissionType.UrbanDelivery;
// }
// var aux = new List<VectoRunData.AuxData>();
// aux.AddRange(auxRD);
// aux.AddRange(auxLH);
// aux.AddRange(auxUD);
// aux.RemoveAll(x => x.ID == Constants.Auxiliaries.IDs.Fan);
// aux.Add(
// new VectoRunData.AuxData {
// DemandType = AuxiliaryDemandType.Direct,
// ID = DrivingCycleDataReader.Fields.AdditionalAuxPowerDemand
// });
// return aux;
// }
// public override IEnumerable<VectoRunData> NextRun()
// {
// if (InitException != null) {
// throw InitException;
// }
// // simulate the Measured cycle
// var vtpCycle = JobInputData.Cycles.FirstOrDefault();
// if (vtpCycle == null) {
// throw new VectoException("no VTP-Cycle provided!");
// }
// var drivingCycle = DrivingCycleDataReader.ReadFromDataTable(vtpCycle.CycleData, vtpCycle.Name, false);
// // Loading is not relevant as we use P_wheel
// var vtpRunData = CreateVectoRunData(Segment, Segment.Missions.First(), Tuple.Create<Kilogram, double?>(0.SI<Kilogram>(), null));
// vtpRunData.Cycle = new DrivingCycleProxy(drivingCycle, vtpCycle.Name);
// vtpRunData.Aux = AuxVTP;
// vtpRunData.FanDataVTP = GetFanData();
// vtpRunData.ExecutionMode = ExecutionMode.Declaration;
// vtpRunData.SimulationType = SimulationType.VerificationTest;
// vtpRunData.Mission = new Mission() {
// MissionType = MissionType.VerificationTest
// };
// vtpRunData.VehicleData.VehicleClass = Segment.VehicleClass;
// vtpRunData.VehicleData.LegislativeClass = JobInputData.Vehicle.LegislativeClass;
// vtpRunData.DriverData = Driverdata;
// //var ncvStd = DeclarationData.FuelData.Lookup(JobInputData.Vehicle.Components.EngineInputData.FuelType).LowerHeatingValueVecto;
// //var ncvCorrection = ncvStd / JobInputData.NetCalorificValueTestFuel;
// var mileageCorrection = GetMileagecorrectionFactor(JobInputData.Mileage);
// vtpRunData.VTPData = new VTPData() {
// CorrectionFactor = mileageCorrection,
// };
// yield return vtpRunData;
// }
// }
//}
/*
* This file is part of VECTO.
*
* Copyright © 2012-2019 European Union
*
* Developed by Graz University of Technology,
* Institute of Internal Combustion Engines and Thermodynamics,
* Institute of Technical Informatics
*
* VECTO is licensed under the EUPL, Version 1.1 or - as soon they will be approved
* by the European Commission - subsequent versions of the EUPL (the "Licence");
* You may not use VECTO except in compliance with the Licence.
* You may obtain a copy of the Licence at:
*
* https://joinup.ec.europa.eu/community/eupl/og_page/eupl
*
* Unless required by applicable law or agreed to in writing, VECTO
* distributed under the Licence is distributed on an "AS IS" basis,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the Licence for the specific language governing permissions and
* limitations under the Licence.
*
* Authors:
* Stefan Hausberger, hausberger@ivt.tugraz.at, IVT, Graz University of Technology
* Christian Kreiner, christian.kreiner@tugraz.at, ITI, Graz University of Technology
* Michael Krisper, michael.krisper@tugraz.at, ITI, Graz University of Technology
* Raphael Luz, luz@ivt.tugraz.at, IVT, Graz University of Technology
* Markus Quaritsch, markus.quaritsch@tugraz.at, IVT, Graz University of Technology
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
using System;
using System.Collections.Generic;
using System.Linq;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.InputData.Reader.ComponentData;
using TUGraz.VectoCore.InputData.Reader.DataObjectAdapter;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.OutputData;
using DeclarationDataAdapterHeavyLorry = TUGraz.VectoCore.InputData.Reader.DataObjectAdapter.HeavyLorry.DeclarationDataAdapterHeavyLorry;
namespace TUGraz.VectoCore.InputData.Reader.Impl
{
internal class DeclarationVTPModeVectoRunDataFactoryLorries : AbstractVTPModeVectoRunDataFactory
{
private ILorryDeclarationDataAdapter _dao;
public DeclarationVTPModeVectoRunDataFactoryLorries(IVTPDeclarationInputDataProvider ivtpProvider, IVTPReport report) : base(
ivtpProvider.JobInputData, report)
{ }
protected DeclarationVTPModeVectoRunDataFactoryLorries(IVTPDeclarationJobInputData job, IVTPReport report) : base(job, report)
{ }
protected override IDeclarationDataAdapter Dao => DataAdapter;
private ILorryDeclarationDataAdapter DataAdapter => _dao ?? (_dao = new DeclarationDataAdapterHeavyLorry.Conventional());
protected override void Initialize()
{
var vehicle = JobInputData.Vehicle;
try
{
Segment = DeclarationData.TruckSegments.Lookup(
vehicle.VehicleCategory,
vehicle.AxleConfiguration,
vehicle.GrossVehicleMassRating,
vehicle.CurbMassChassis,
vehicle.VocationalVehicle);
}
catch (VectoException)
{
_allowVocational = false;
Segment = DeclarationData.TruckSegments.Lookup(
vehicle.VehicleCategory,
vehicle.AxleConfiguration,
vehicle.GrossVehicleMassRating,
vehicle.CurbMassChassis,
false);
}
Driverdata = DataAdapter.CreateDriverData();
Driverdata.AccelerationCurve = AccelerationCurveReader.ReadFromStream(Segment.AccelerationFile);
var tempVehicle = Dao.CreateVehicleData(
vehicle, Segment, Segment.Missions.First(),
Segment.Missions.First().Loadings.First(), _allowVocational);
var vtpMission = Segment.VehicleClass.IsMediumLorry()
? DeclarationData.VTPMode.SelectedMissionMediumLorry
: DeclarationData.VTPMode.SelectedMissionHeavyLorry;
AirdragData = DataAdapter.CreateAirdragData(
vehicle.Components.AirdragInputData,
Segment.Missions.First(), Segment);
EngineData = DataAdapter.CreateEngineData(
vehicle, vehicle.Components.EngineInputData.EngineModes.First(),
new Mission() { MissionType = vtpMission });
AxlegearData = JobInputData.Vehicle.Components.GearboxInputData.DifferentialIncluded
? DataAdapter.CreateDummyAxleGearData(JobInputData.Vehicle.Components.GearboxInputData)
: DataAdapter.CreateAxleGearData(vehicle.Components.AxleGearInputData);
AngledriveData = DataAdapter.CreateAngledriveData(vehicle.Components.AngledriveInputData);
GearboxData = DataAdapter.CreateGearboxData(
vehicle, new VectoRunData() { EngineData = EngineData, AxleGearData = AxlegearData, VehicleData = tempVehicle },
null);
RetarderData = DataAdapter.CreateRetarderData(vehicle.Components.RetarderInputData);
PTOTransmissionData =
DataAdapter.CreatePTOTransmissionData(vehicle.Components.PTOTransmissionInputData);
GearshiftData = DataAdapter.CreateGearshiftData(
GearboxData, AxlegearData.AxleGear.Ratio * (AngledriveData?.Angledrive.Ratio ?? 1.0), EngineData.IdleSpeed);
AuxVTP = CreateVTPAuxData(vehicle);
}
protected override IEnumerable<VectoRunData.AuxData> GetAuxiliaryData(MissionType missionType)
{
return DataAdapter.CreateAuxiliaryData(
JobInputData.Vehicle.Components.AuxiliaryInputData,
JobInputData.Vehicle.Components.BusAuxiliaries,
missionType,
Segment.VehicleClass, JobInputData.Vehicle.Length,
JobInputData.Vehicle.Components.AxleWheels.NumSteeredAxles);
}
protected virtual List<VectoRunData.AuxData> CreateVTPAuxData(IVehicleDeclarationInputData vehicle)
{
var numSteered = vehicle.Components.AxleWheels.NumSteeredAxles;
var auxRD = DataAdapter.CreateAuxiliaryData(
vehicle.Components.AuxiliaryInputData, vehicle.Components.BusAuxiliaries, MissionType.RegionalDelivery, Segment.VehicleClass, vehicle.Length, numSteered)
.ToList();
foreach (var entry in auxRD)
{
entry.MissionType = MissionType.RegionalDelivery;
}
var auxLH = DataAdapter.CreateAuxiliaryData(
vehicle.Components.AuxiliaryInputData, vehicle.Components.BusAuxiliaries, MissionType.LongHaul, Segment.VehicleClass, vehicle.Length, numSteered)
.ToList();
foreach (var entry in auxLH)
{
entry.MissionType = MissionType.LongHaul;
}
var auxUD = DataAdapter.CreateAuxiliaryData(
vehicle.Components.AuxiliaryInputData, vehicle.Components.BusAuxiliaries, MissionType.UrbanDelivery, Segment.VehicleClass, vehicle.Length, numSteered)
.ToList();
foreach (var entry in auxUD)
{
entry.MissionType = MissionType.UrbanDelivery;
}
var aux = new List<VectoRunData.AuxData>();
aux.AddRange(auxRD);
aux.AddRange(auxLH);
aux.AddRange(auxUD);
aux.RemoveAll(x => x.ID == Constants.Auxiliaries.IDs.Fan);
aux.Add(
new VectoRunData.AuxData
{
DemandType = AuxiliaryDemandType.Direct,
ID = DrivingCycleDataReader.Fields.AdditionalAuxPowerDemand
});
return aux;
}
public override IEnumerable<VectoRunData> NextRun()
{
if (InitException != null)
{
throw InitException;
}
// simulate the Measured cycle
var vtpCycle = JobInputData.Cycles.FirstOrDefault();
if (vtpCycle == null)
{
throw new VectoException("no VTP-Cycle provided!");
}
var drivingCycle = DrivingCycleDataReader.ReadFromDataTable(vtpCycle.CycleData, vtpCycle.Name, false);
// Loading is not relevant as we use P_wheel
var vtpRunData = CreateVectoRunData(Segment, Segment.Missions.First(), Tuple.Create<Kilogram, double?>(0.SI<Kilogram>(), null));
vtpRunData.Cycle = new DrivingCycleProxy(drivingCycle, vtpCycle.Name);
vtpRunData.Aux = AuxVTP;
vtpRunData.FanDataVTP = GetFanData();
vtpRunData.ExecutionMode = ExecutionMode.Declaration;
vtpRunData.SimulationType = SimulationType.VerificationTest;
vtpRunData.Mission = new Mission()
{
MissionType = MissionType.VerificationTest
};
vtpRunData.VehicleData.VehicleClass = Segment.VehicleClass;
vtpRunData.VehicleData.LegislativeClass = JobInputData.Vehicle.LegislativeClass;
vtpRunData.DriverData = Driverdata;
//var ncvStd = DeclarationData.FuelData.Lookup(JobInputData.Vehicle.Components.EngineInputData.FuelType).LowerHeatingValueVecto;
//var ncvCorrection = ncvStd / JobInputData.NetCalorificValueTestFuel;
var mileageCorrection = GetMileagecorrectionFactor(JobInputData.Mileage);
vtpRunData.VTPData = new VTPData()
{
CorrectionFactor = mileageCorrection,
};
yield return vtpRunData;
}
}
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about