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

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

Pull request #897: adding gyre version 2.3 

Merge in VECTO/vecto-sim from VECTO/mq_vecto-sim:VECTO-1619-adaptations-of-xml-results-in-transition-period to develop

* commit '3dbe2c58':
  adding gyre version 2.3
parents c65c09bc 3dbe2c58
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 36 additions and 11 deletions
VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationTyreDataProvider.cs
+ 18
− 0
View file @ 4a9ca5ba
......@@ -126,4 +126,22 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
get { return NAMESPACE_URI; }
}
}
// ---------------------------------------------------------------------------------------
public class XMLDeclarationTyreDataProviderV23 : XMLDeclarationTyreDataProviderV10
{
public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V23;
//public new const string XSD_TYPE = "TyreComponentDeclarationType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
public XMLDeclarationTyreDataProviderV23(IXMLDeclarationVehicleData vehicle, XmlNode componentNode, string sourceFile)
: base(vehicle, componentNode, sourceFile) { }
protected override XNamespace SchemaNamespace => NAMESPACE_URI;
//public override string FuelEfficiencyClass => GetString("FuelEfficiencyClass");
}
}
VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataV23InjectModule.cs
+ 3
− 0
View file @ 4a9ca5ba
......@@ -9,6 +9,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.NinjectModules
public override void Load() {
Bind<IXMLEngineDeclarationInputData>().To<XMLDeclarationEngineDataProviderV23>().Named(
XMLDeclarationEngineDataProviderV23.QUALIFIED_XSD_TYPE);
Bind<IXMLTyreDeclarationInputData>().To<XMLDeclarationTyreDataProviderV23>().Named(
XMLDeclarationTyreDataProviderV23.QUALIFIED_XSD_TYPE);
}
}
}
\ No newline at end of file
VectoCore/VectoCore/OutputData/XML/XMLCustomerReport.cs
+ 9
− 6
View file @ 4a9ca5ba
......@@ -96,7 +96,7 @@ namespace TUGraz.VectoCore.OutputData.XML
new XElement(tns + XMLNames.Vehicle_ZeroEmissionVehicle, modelData.VehicleData.ZeroEmissionVehicle),
new XElement(tns + XMLNames.Vehicle_HybridElectricHDV, modelData.VehicleData.HybridElectricHDV),
new XElement(tns + "WasteHeatRecovery", modelData.EngineData.WHRType != WHRType.None),
new XElement(tns + XMLNames.Vehicle_DualFuelVehicle, modelData.VehicleData.DualFuelVehicle),
new XElement(tns + XMLNames.Vehicle_DualFuelVehicle, modelData.EngineData.Fuels.Count > 1),
exempted ? ExemptedData(modelData) : new[] {
new XElement(tns + XMLNames.Vehicle_AxleConfiguration, modelData.VehicleData.AxleConfiguration.GetName()),
......@@ -134,7 +134,7 @@ namespace TUGraz.VectoCore.OutputData.XML
private XElement[] ComponentData(VectoRunData modelData)
{
return new[] {
var retVal = new List<XElement>() {
new XElement(
tns + XMLNames.Report_Vehicle_EngineRatedPower,
XMLHelper.ValueAsUnit(modelData.EngineData.RatedPowerDeclared, XMLNames.Unit_kW)),
......@@ -147,7 +147,10 @@ namespace TUGraz.VectoCore.OutputData.XML
// fuelModes.SelectMany(x => x.Select(f => f.FuelType.ToXMLFormat())).Distinct()
// .Select(x => new XElement(tns + XMLNames.Engine_FuelType, x))
//),
new XElement(tns + XMLNames.Engine_FuelType, modelData.EngineData.Fuels.First().FuelData.FuelType.ToXMLFormat()),
};
retVal.AddRange(modelData.EngineData.Fuels.Select(x =>
new XElement(tns + XMLNames.Engine_FuelType, x.FuelData.FuelType.ToXMLFormat())));
retVal.AddRange(new [] {
new XElement(
tns + XMLNames.Report_Vehicle_TransmissionCertificationMethod,
modelData.GearboxData.CertificationMethod.ToXMLFormat()),
......@@ -160,8 +163,8 @@ namespace TUGraz.VectoCore.OutputData.XML
new XElement(
tns + XMLNames.Report_Vehicle_AverageRRCLabel,
DeclarationData.Wheels.TyreClass.Lookup(modelData.VehicleData.AverageRollingResistanceTruck))
};
});
return retVal.ToArray();
}
private XElement CreateDummySig()
......@@ -210,7 +213,7 @@ namespace TUGraz.VectoCore.OutputData.XML
{
return new object[] {
new XElement(tns + XMLNames.Report_Result_Payload, XMLHelper.ValueAsUnit(result.Payload, XMLNames.Unit_kg, 0)),
new XElement(tns + XMLNames.Report_Results_FuelType, XMLHelper.ToXmlStr(DeclarationData.FuelData.Lookup(result.FuelData.First().FuelType, result.FuelData.First().TankSystem))),
result.FuelData.Select(x => new XElement(tns + XMLNames.Report_Results_FuelType, XMLHelper.ToXmlStr(DeclarationData.FuelData.Lookup(x.FuelType, x.TankSystem)))),
new XElement(tns + XMLNames.Report_Results_AverageSpeed, XMLHelper.ValueAsUnit(result.AverageSpeed, XMLNames.Unit_kmph, 1)),
XMLDeclarationReport.GetResults(result, tns, false).Cast<object>().ToArray()
};
......
VectoCore/VectoCore/OutputData/XML/XMLManufacturerReport.cs
+ 2
− 2
View file @ 4a9ca5ba
......@@ -91,7 +91,7 @@ namespace TUGraz.VectoCore.OutputData.XML
new XElement(tns + XMLNames.Vehicle_CurbMassChassis, XMLHelper.ValueAsUnit(modelData.VehicleData.CurbMass, XMLNames.Unit_kg)),
new XElement(tns + XMLNames.Vehicle_ZeroEmissionVehicle, modelData.VehicleData.ZeroEmissionVehicle),
new XElement(tns + XMLNames.Vehicle_HybridElectricHDV, modelData.VehicleData.HybridElectricHDV),
new XElement(tns + XMLNames.Vehicle_DualFuelVehicle, modelData.VehicleData.DualFuelVehicle),
new XElement(tns + XMLNames.Vehicle_DualFuelVehicle, modelData.EngineData.Fuels.Count > 1),
exempted
? ExemptedData(modelData)
: new[] {
......@@ -391,7 +391,7 @@ namespace TUGraz.VectoCore.OutputData.XML
new XElement(tns + XMLNames.Report_ResultEntry_SimulationParameters,
new XElement(tns + XMLNames.Report_ResultEntry_TotalVehicleMass, XMLHelper.ValueAsUnit(result.TotalVehicleWeight, XMLNames.Unit_kg)),
new XElement(tns + XMLNames.Report_ResultEntry_Payload, XMLHelper.ValueAsUnit(result.Payload, XMLNames.Unit_kg)),
new XElement(tns + XMLNames.Report_ResultEntry_FuelType, XMLHelper.ToXmlStr(DeclarationData.FuelData.Lookup(result.FuelData.First().FuelType, result.FuelData.First().TankSystem)))
result.FuelData.Select(x => new XElement(tns + XMLNames.Report_ResultEntry_FuelType, XMLHelper.ToXmlStr(DeclarationData.FuelData.Lookup(x.FuelType, x.TankSystem))))
),
new XElement(tns + XMLNames.Report_ResultEntry_VehiclePerformance,
new XElement(tns + XMLNames.Report_ResultEntry_AverageSpeed, XMLHelper.ValueAsUnit(result.AverageSpeed, XMLNames.Unit_kmph, 1)),
......
VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.7.2.xsd
+ 2
− 2
View file @ 4a9ca5ba
......@@ -46,7 +46,7 @@
</xs:simpleContent>
</xs:complexType>
</xs:element>
<xs:element name="FuelType" type="xs:string"/>
<xs:element name="FuelType" type="xs:string" maxOccurs="unbounded"/>
<xs:element name="AverageSpeed">
<xs:complexType>
<xs:simpleContent>
......@@ -301,7 +301,7 @@
</xs:simpleContent>
</xs:complexType>
</xs:element>
<xs:element name="FuelType" type="vdecdef:FuelTypeType">
<xs:element name="FuelType" type="vdecdef:FuelTypeType" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>P193 / II.1.2.3</xs:documentation>
</xs:annotation>
......
VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.7.2.xsd
+ 1
− 1
View file @ 4a9ca5ba
......@@ -441,7 +441,7 @@
</xs:simpleContent>
</xs:complexType>
</xs:element>
<xs:element name="FuelType" type="xs:string">
<xs:element name="FuelType" type="xs:string" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>P193, P275 / I.2.1.3 / #58</xs:documentation>
</xs:annotation>
......
VectoCore/VectoCore/VectoCore.csproj
+ 1
− 0
View file @ 4a9ca5ba
......@@ -178,6 +178,7 @@
<Compile Include="InputData\FileIO\XML\Declaration\NinjectModules\XMLDeclarationInputDataV21InjectModule.cs" />
<Compile Include="InputData\FileIO\XML\Declaration\NinjectModules\XMLDeclarationInputDataV221InjectModule.cs" />
<Compile Include="InputData\FileIO\XML\Declaration\NinjectModules\XMLDeclarationInputDataV22InjectModule.cs" />
<Compile Include="InputData\FileIO\XML\Declaration\NinjectModules\XMLDeclarationInputDataV23InjectModule.cs" />
<Compile Include="InputData\FileIO\XML\Declaration\Reader\Impl\AbstractComponentReader.cs" />
<Compile Include="InputData\FileIO\XML\Declaration\Reader\Impl\XMLADASReader.cs" />
<Compile Include="InputData\FileIO\XML\Declaration\Reader\Impl\XMLComponentReader.cs" />
......
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