From 3bd56c3ce306e88ec5c5c70bcffd3f59668e5175 Mon Sep 17 00:00:00 2001 From: Harald Martini <harald.martini@student.tugraz.at> Date: Wed, 1 Jun 2022 16:59:51 +0200 Subject: [PATCH] renamed XSD types to match changes in XML Schema --- .../XMLDeclarationAngledriveDataProvider.cs | 2 +- .../XMLDeclarationAxlegearDataProvider.cs | 2 +- .../XMLDeclarationAxlesDataProvider.cs | 2 +- ...MLDeclarationBusAuxiliariesDataProvider.cs | 2 +- .../XMLDeclarationComponentsDataProvider.cs | 2 +- .../XMLDeclarationEngineDataProvider.cs | 2 +- .../XMLDeclarationGearboxDataProvider.cs | 2 +- .../XMLDeclarationJobInputDataProvider.cs | 2 +- ...LDeclarationTorqueConverterDataProvider.cs | 2 +- .../XMLDeclarationVehicleDataProvider.cs | 2 +- .../Declaration/DataProvider/XMLGearData.cs | 2 +- .../Reader/Impl/XMLComponentReader.cs | 6 +++--- .../Reader/Impl/XMLJobDataReader.cs | 2 +- .../Models/Simulation/Impl/JobContainer.cs | 4 +++- .../XMLPrimaryBusVehicleReport.cs | 20 +++++++++---------- 15 files changed, 28 insertions(+), 26 deletions(-) diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAngledriveDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAngledriveDataProvider.cs index bee76d3ee5..b6ef988d78 100644 --- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAngledriveDataProvider.cs +++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAngledriveDataProvider.cs @@ -112,7 +112,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider { public new static XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1; - public new const string XSD_TYPE = "AngledriveDataPIFType"; + public new const string XSD_TYPE = "AngledriveDataVIFType"; public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE); diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAxlegearDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAxlegearDataProvider.cs index 241830b52f..238d531c9b 100644 --- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAxlegearDataProvider.cs +++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAxlegearDataProvider.cs @@ -117,7 +117,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider { public new static XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1; - public new const string XSD_TYPE = "AxlegearDataPIFType"; + public new const string XSD_TYPE = "AxlegearDataVIFType"; public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE); diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAxlesDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAxlesDataProvider.cs index 7181384e6f..3fc34bec5a 100644 --- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAxlesDataProvider.cs +++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAxlesDataProvider.cs @@ -143,7 +143,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider { public new static XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1; - public new const string XSD_TYPE = "AxleWheelsDataPIFType"; + public new const string XSD_TYPE = "AxleWheelsDataVIFType"; public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE); diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationBusAuxiliariesDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationBusAuxiliariesDataProvider.cs index 9cc9f3406c..277ad4e144 100644 --- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationBusAuxiliariesDataProvider.cs +++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationBusAuxiliariesDataProvider.cs @@ -323,7 +323,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider { public new static XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1; - public const string XSD_TYPE = "AuxiliaryDataPIFType"; + public const string XSD_TYPE = "AuxiliaryDataVIFType"; public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE); diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs index ef230ebba4..26139c5d70 100644 --- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs +++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs @@ -215,7 +215,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider { public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1; - public new const string XSD_TYPE = "VehicleComponentsPIFType"; + public new const string XSD_TYPE = "VehicleComponentsVIFType"; public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE); diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationEngineDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationEngineDataProvider.cs index 2fd94d18f4..660f63da51 100644 --- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationEngineDataProvider.cs +++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationEngineDataProvider.cs @@ -404,7 +404,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider { public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1; - public new const string XSD_TYPE = "EngineDataPIFType"; + public new const string XSD_TYPE = "EngineDataVIFType"; public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE); diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationGearboxDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationGearboxDataProvider.cs index 6942da549b..ed683e1e1e 100644 --- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationGearboxDataProvider.cs +++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationGearboxDataProvider.cs @@ -176,7 +176,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider { public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1; - public new const string XSD_TYPE = "TransmissionDataPIFType"; + public new const string XSD_TYPE = "TransmissionDataVIFType"; public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE); diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationJobInputDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationJobInputDataProvider.cs index 66e61a87fc..10edeb2ae6 100644 --- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationJobInputDataProvider.cs +++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationJobInputDataProvider.cs @@ -113,7 +113,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider { public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1; - public const string XSD_TYPE = "VehiclePIFType"; + public const string XSD_TYPE = "ConventionalVehicleVIFType"; public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE); diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationTorqueConverterDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationTorqueConverterDataProvider.cs index a3706df1d1..6081463d19 100644 --- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationTorqueConverterDataProvider.cs +++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationTorqueConverterDataProvider.cs @@ -94,7 +94,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider { public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1; - public new const string XSD_TYPE = "TorqueConverterDataPIFType"; + public new const string XSD_TYPE = "TorqueConverterDataVIFType"; public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE); diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs index cc10e9e6b1..796d106fe0 100644 --- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs +++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs @@ -462,7 +462,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1; - public const string XSD_TYPE = "VehiclePIFType"; + public const string XSD_TYPE = "ConventionalVehicleVIFType"; public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE); diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLGearData.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLGearData.cs index 44a39085ca..c5db204923 100644 --- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLGearData.cs +++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLGearData.cs @@ -133,7 +133,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider { public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1; - public new const string XSD_TYPE = "TransmissionGearPIFType"; + public new const string XSD_TYPE = "TransmissionGearVIFType"; public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE); diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLComponentReader.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLComponentReader.cs index 2a4f4b5288..259deb4bd6 100644 --- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLComponentReader.cs +++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLComponentReader.cs @@ -609,9 +609,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl { public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1; - public new const string XSD_TYPE = "VehicleComponentsPIFType"; - public new const string GEARBOX_READER_TYPE = "TransmissionDataPIFType"; - public new const string AXLES_READER_TYPE = "AxleWheelsDataPIFType"; + public new const string XSD_TYPE = "Vehicle_Conventional_ComponentsVIFType"; + public new const string GEARBOX_READER_TYPE = "TransmissionDataVIFType"; + public new const string AXLES_READER_TYPE = "AxleWheelsDataVIFType"; public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE); public new static readonly string GEARBOX_READER_QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI, GEARBOX_READER_TYPE); diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLJobDataReader.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLJobDataReader.cs index 52d4631c79..71682ad598 100644 --- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLJobDataReader.cs +++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLJobDataReader.cs @@ -141,7 +141,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl { public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1; - public const string XSD_TYPE = "VehiclePIFType"; + public const string XSD_TYPE = "ConventionalVehicleVIFType"; public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE); diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/JobContainer.cs b/VectoCore/VectoCore/Models/Simulation/Impl/JobContainer.cs index 23d057bf46..ad2dc8c984 100644 --- a/VectoCore/VectoCore/Models/Simulation/Impl/JobContainer.cs +++ b/VectoCore/VectoCore/Models/Simulation/Impl/JobContainer.cs @@ -110,7 +110,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl return _simulatorFactory.FollowUpSimulatorFactory; } catch (Exception e){ LogManager.GetLogger(typeof(JobContainer).FullName).Error(e); - throw; + throw e; }finally { } @@ -371,7 +371,9 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl AddRuns(additionalSimulatorFactory); Execute(_multithreaded); } catch (Exception ex) { + Log.Error(ex.Message); + throw; } } diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLPrimaryBusVehicleReport.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLPrimaryBusVehicleReport.cs index 9082fcffbb..be8dd7cabe 100644 --- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLPrimaryBusVehicleReport.cs +++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLPrimaryBusVehicleReport.cs @@ -132,7 +132,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF public virtual void Initialize(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes) { VehiclePart.Add( - new XAttribute(xsi + "type", "VehiclePIFType"), + new XAttribute(xsi + "type", "ConventionalVehicleVIFType"), new XElement(tns + XMLNames.ManufacturerPrimaryVehicle, modelData.VehicleData.Manufacturer), new XElement(tns + XMLNames.ManufacturerAddressPrimaryVehicle, modelData.VehicleData.ManufacturerAddress), new XElement(tns + XMLNames.Component_Model, modelData.VehicleData.ModelName), @@ -196,7 +196,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF { return new XElement( tns + XMLNames.Vehicle_Components, - new XAttribute(xsi + "type", "VehicleComponentsPIFType"), + new XAttribute(xsi + "type", "Vehicle_Conventional_ComponentsVIFType"), GetEngineDescription(modelData.EngineData, fuelModes), GetGearboxDescription(modelData.GearboxData), GetTorqueConverterDescription(modelData.GearboxData.TorqueConverterData), @@ -214,7 +214,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF return new XElement(tns + XMLNames.Component_TorqueConverter, new XElement(tns + XMLNames.Report_DataWrap, - new XAttribute(xsi + "type", "TorqueConverterDataPIFType"), + new XAttribute(xsi + "type", "TorqueConverterDataVIFType"), GetCommonDescription(torqueConverter), new XElement(tns + XMLNames.Component_AppVersion, torqueConverter.AppVersion) )); @@ -228,7 +228,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF return new XElement(tns + XMLNames.Component_AxleWheels, new XElement(tns + XMLNames.Report_DataWrap, - new XAttribute(xsi + "type", "AxleWheelsDataPIFType"), + new XAttribute(xsi + "type", "AxleWheelsDataVIFType"), new XElement(tns + XMLNames.AxleWheels_Axles, GetAxlesNodes(axlesNodes) ))); @@ -265,7 +265,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF var result = new XElement(tns + XMLNames.Component_Auxiliaries, new XElement(tns + XMLNames.ComponentDataWrapper, - new XAttribute(xsi + "type", "AuxiliaryDataPIFType"), + new XAttribute(xsi + "type", "AuxiliaryDataVIFType"), //new XAttribute("xmlns", tns.NamespaceName), //automically created new XElement(tns + XMLNames.BusAux_Fan, new XElement(tns + XMLNames.BusAux_Technology, aux.FanTechnology)), GetSteeringPumpElement(aux.SteeringPumpTechnology), @@ -386,7 +386,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF private XElement GetAxlegearDescription(AxleGearData axleGearData) { return WrapComponent( - XMLNames.Component_Axlegear, "AxlegearDataPIFType", + XMLNames.Component_Axlegear, "AxlegearDataVIFType", GetCommonDescription(axleGearData), new XElement(tns + XMLNames.Component_AppVersion, axleGearData.InputData.AppVersion), new XElement(tns + XMLNames.Axlegear_LineType, axleGearData.LineType.ToXMLFormat()), @@ -400,7 +400,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF } - return WrapComponent(XMLNames.Component_Angledrive, "AngledriveDataPIFType", + return WrapComponent(XMLNames.Component_Angledrive, "AngledriveDataVIFType", GetCommonDescription(angledriveData), new XElement(tns + XMLNames.Component_AppVersion, angledriveData.InputData.AppVersion), new XElement(tns + XMLNames.AngleDrive_Ratio, angledriveData.Angledrive.Ratio.ToXMLFormat(3)) @@ -410,12 +410,12 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF private XElement GetGearboxDescription(GearboxData gearboxData) { var retVal = WrapComponent( - "Transmission", "TransmissionDataPIFType", + "Transmission", "TransmissionDataVIFType", GetCommonDescription(gearboxData), new XElement(tns + XMLNames.Gearbox_TransmissionType, gearboxData.Type.ToXMLFormat()), new XElement( tns + XMLNames.Gearbox_Gears, - new XAttribute(xsi + "type", "TransmissionGearsPIFType"), + new XAttribute(xsi + "type", "TransmissionGearsVIFType"), gearboxData.Gears.Select( x => new XElement( @@ -459,7 +459,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF } var retVal = WrapComponent( - XMLNames.Component_Engine, "EngineDataPIFType", + XMLNames.Component_Engine, "EngineDataVIFType", GetCommonDescription(engineData), new XElement(tns + XMLNames.Engine_Displacement, engineData.Displacement.ConvertToCubicCentiMeter().ToXMLFormat(0)), new XElement(tns + XMLNames.Engine_RatedSpeed, engineData.RatedSpeedDeclared.AsRPM.ToXMLFormat(0)), -- GitLab