diff --git a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
index c4c74728e14ab729476796a3fe79ed7b361decf8..e14e0b86806779bd7a4d75d020efdee436e9b22e 100644
--- a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
@@ -261,11 +261,6 @@ namespace TUGraz.VectoCommon.InputData
/// </summary>
double Efficiency { get; }
- ///// <summary>
- ///// P145
- ///// cf. VECTO Input Parameters.xlsx
- ///// </summary>
- //DataTable FullLoadCurve { get; } // deprecated
/// <summary>
/// P157
@@ -280,12 +275,6 @@ namespace TUGraz.VectoCommon.InputData
/// cf. VECTO Input Parameters.xlsx
/// </summary>
TableData ShiftPolygon { get; }
-
- ///// <summary>
- ///// P077
- ///// cf. VECTO Input Parameters.xlsx
- ///// </summary>
- //bool HasTorqueConverter { get; } // DEPRECATED
}
public interface IAxleGearInputData : IComponentInputData
@@ -409,8 +398,6 @@ namespace TUGraz.VectoCommon.InputData
public interface IDriverDeclarationInputData
{
bool SavedInDeclarationMode { get; }
-
- //IOverSpeedEcoRollDeclarationInputData OverSpeedEcoRoll { get; }
}
public interface IOverSpeedEcoRollDeclarationInputData
diff --git a/VectoCommon/VectoCommon/InputData/IInputDataProvider.cs b/VectoCommon/VectoCommon/InputData/IInputDataProvider.cs
index 53f5309230828aa131ecbb2a889ed43ae7e464ee..8bab9043efb58bad5ca01ac80a0a6c26e13abb4f 100644
--- a/VectoCommon/VectoCommon/InputData/IInputDataProvider.cs
+++ b/VectoCommon/VectoCommon/InputData/IInputDataProvider.cs
@@ -40,28 +40,6 @@ namespace TUGraz.VectoCommon.InputData
{
IDeclarationJobInputData JobInputData { get; }
- //IVehicleDeclarationInputData VehicleInputData { get; }
-
- //IAirdragDeclarationInputData AirdragInputData { get; }
-
- //IGearboxDeclarationInputData GearboxInputData { get; }
-
- //ITorqueConverterDeclarationInputData TorqueConverterInputData { get; }
-
- //IAxleGearInputData AxleGearInputData { get; }
-
- //IAngledriveInputData AngledriveInputData { get; }
-
- //IEngineDeclarationInputData EngineInputData { get; }
-
- //IAuxiliariesDeclarationInputData AuxiliaryInputData();
-
- //IRetarderInputData RetarderInputData { get; }
-
- //IDriverDeclarationInputData DriverInputData { get; }
-
- //IPTOTransmissionInputData PTOTransmissionInputData { get; }
-
XElement XMLHash { get; }
}
@@ -69,27 +47,7 @@ namespace TUGraz.VectoCommon.InputData
{
IEngineeringJobInputData JobInputData { get; }
- //IVehicleEngineeringInputData VehicleInputData { get; }
-
- //IAirdragEngineeringInputData AirdragInputData { get; }
-
- //IGearboxEngineeringInputData GearboxInputData { get; }
-
- //ITorqueConverterEngineeringInputData TorqueConverterInputData { get; }
-
- //IAxleGearInputData AxleGearInputData { get; }
-
- //IAngledriveInputData AngledriveInputData { get; }
-
- //IEngineEngineeringInputData EngineInputData { get; }
-
- //IAuxiliariesEngineeringInputData AuxiliaryInputData();
-
- //IRetarderInputData RetarderInputData { get; }
-
IDriverEngineeringInputData DriverInputData { get; }
-
- //IPTOTransmissionInputData PTOTransmissionInputData { get; }
}
public interface IEPTPInputDataProvider : IInputDataProvider
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
index 068c2112b9a9bc2b14c94436f245f5a3dc2d5de9..503b9da50d75d183c7ec664f51f8fd32a8a5140f 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
@@ -85,106 +85,20 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
get { throw new NotImplementedException(); }
}
- public XElement XMLHash { get { return new XElement(XMLNames.DI_Signature); } }
-
-
- //IVehicleDeclarationInputData IDeclarationJobInputData.Vehicle
- //{
- // get { return VehicleData; }
- //}
-
- //IAirdragDeclarationInputData IDeclarationInputDataProvider.AirdragInputData
- //{
- // get { return AirdragInputData; }
- //}
-
- //public IAirdragEngineeringInputData AirdragInputData
- //{
- // get { return AirdragData; }
- //}
-
- //IGearboxDeclarationInputData IDeclarationInputDataProvider.GearboxInputData
- //{
- // get { return GearboxInputData; }
- //}
+ public XElement XMLHash
+ {
+ get { return new XElement(XMLNames.DI_Signature); }
+ }
- //ITorqueConverterDeclarationInputData IDeclarationInputDataProvider.TorqueConverterInputData
- //{
- // get { return TorqueConverterInputData; }
- //}
IDeclarationJobInputData IDeclarationInputDataProvider.JobInputData
{
- get {
- throw new NotImplementedException();
- }
+ get { throw new NotImplementedException(); }
}
- //public IVehicleEngineeringInputData VehicleInputData
- //{
- // get { return VehicleData; }
- //}
-
- //public IGearboxEngineeringInputData GearboxInputData
- //{
- // get { return Gearbox; }
- //}
-
- //public ITorqueConverterEngineeringInputData TorqueConverterInputData
- //{
- // get { return TorqueConverter; }
- //}
-
- //public IAxleGearInputData AxleGearInputData
- //{
- // get { return AxleGear; }
- //}
-
- //public IAngledriveInputData AngledriveInputData
- //{
- // get { return Angledrive; }
- //}
-
- //IEngineDeclarationInputData IDeclarationInputDataProvider.EngineInputData
- //{
- // get { return EngineInputData; }
- //}
-
- //public IEngineEngineeringInputData EngineInputData
- //{
- // get { return Engine; }
- //}
-
- //public IAuxiliariesEngineeringInputData AuxiliaryInputData()
- //{
- // throw new NotImplementedException();
- //}
-
- //IAuxiliariesDeclarationInputData IDeclarationInputDataProvider.AuxiliaryInputData()
- //{
- // throw new NotImplementedException();
- //}
-
- //public IRetarderInputData RetarderInputData
- //{
- // get { return Retarder; }
- //}
-
- //IDriverDeclarationInputData IDeclarationInputDataProvider.DriverInputData
- //{
- // get { throw new NotImplementedException(); }
- //}
-
public IDriverEngineeringInputData DriverInputData
{
get { throw new NotImplementedException(); }
}
-
- //public IPTOTransmissionInputData PTOTransmissionInputData
- //{
- // get { return PTOTransmission; }
- //}
-
-
}
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
index 225d2ef299cbb35761b83c9a62fcfc93138340a1..31209c93caa73197a2bcd5a8514773f3d64340c3 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
@@ -129,11 +129,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public IGearboxEngineeringInputData Gearbox { get; internal set; }
public IAxleGearInputData AxleGear { get; internal set; }
public ITorqueConverterEngineeringInputData TorqueConverter { get; internal set; }
- //public IAngledriveInputData Angledrive { get; internal set; }
public IEngineEngineeringInputData Engine { get; internal set; }
- //public IRetarderInputData Retarder { get; internal set; }
- //public IPTOTransmissionInputData PTOTransmission { get; internal set; }
- //public IAirdragEngineeringInputData AirdragData { get; internal set; }
+
protected readonly IVehicleEngineeringInputData VehicleData;
@@ -156,10 +153,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
TorqueConverter = Gearbox as ITorqueConverterEngineeringInputData;
VehicleData = ReadVehicle();
- //Angledrive = VehicleData as IAngledriveInputData;
- //Retarder = VehicleData as IRetarderInputData;
- //PTOTransmission = VehicleData as IPTOTransmissionInputData;
- //AirdragData = VehicleData as IAirdragEngineeringInputData;
}
private IVehicleEngineeringInputData ReadVehicle()
@@ -204,7 +197,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
throw new VectoException("JobFile: Failed to read Engine file '{0}': {1}", e, Body[JsonKeys.Vehicle_EngineFile],
e.Message);
}
- //JToken.FromObject(New Dictionary(Of String, Object) From {{"Header", header}, {"Body", body}})
+
return
new JSONEngineDataV3(GetDummyJSONStructure(),
Path.Combine(BasePath, Body.GetEx(JsonKeys.Vehicle_EngineFile).Value<string>()) + MissingFileSuffix);
@@ -218,37 +211,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
get { return VehicleInputData; }
}
- //IAirdragDeclarationInputData IDeclarationInputDataProvider.AirdragInputData
- //{
- // get { return AirdragInputData; }
- //}
-
- //public IAirdragEngineeringInputData AirdragInputData
- //{
- // get { return AirdragData; }
- //}
-
- //IGearboxDeclarationInputData IDeclarationInputDataProvider.GearboxInputData
- //{
- // get { return GearboxInputData; }
- //}
-
- //ITorqueConverterDeclarationInputData IDeclarationInputDataProvider.TorqueConverterInputData
- //{
- // get { return TorqueConverterInputData; }
- //}
-
- //public ITorqueConverterEngineeringInputData TorqueConverterInputData
- //{
- // get
- // {
- // if (TorqueConverter == null) {
- // throw new InvalidFileFormatException("TorqueConverterData not found");
- // }
- // return TorqueConverter;
- // }
- //}
-
public virtual IEngineeringJobInputData JobInputData
{
get { return this; }
@@ -276,42 +238,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
}
}
- //public virtual IGearboxEngineeringInputData GearboxInputData
- //{
- // [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design",
- // "CA1065:DoNotRaiseExceptionsInUnexpectedLocations")]
- // get
- // {
- // if (Gearbox == null) {
- // throw new InvalidFileFormatException("GearboxData not found");
- // }
- // return Gearbox;
- // }
- //}
-
- //public virtual IAxleGearInputData AxleGearInputData
- //{
- // [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design",
- // "CA1065:DoNotRaiseExceptionsInUnexpectedLocations")]
- // get
- // {
- // if (AxleGear == null) {
- // throw new InvalidFileFormatException("AxleGearData not found");
- // }
- // return AxleGear;
- // }
- //}
-
- //public IAngledriveInputData AngledriveInputData
- //{
- // get { return Angledrive; }
- //}
-
- //IEngineDeclarationInputData IDeclarationInputDataProvider.EngineInputData
- //{
- // get { return EngineInputData; }
- //}
-
public virtual IEngineEngineeringInputData EngineOnly
{
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design",
@@ -324,49 +250,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
}
}
- //public virtual IAuxiliariesEngineeringInputData AuxiliaryInputData()
- //{
- // return this;
- //}
-
IDriverEngineeringInputData IEngineeringInputDataProvider.DriverInputData
{
get { return this; }
}
- //public IPTOTransmissionInputData PTOTransmissionInputData
- //{
- // get { return PTOTransmission; }
- //}
-
- //public XElement XMLHash
- //{
- // get { return null; }
- //}
-
- //IAuxiliariesDeclarationInputData IDeclarationInputDataProvider.AuxiliaryInputData()
- //{
- // return this;
- //}
-
- //public virtual IRetarderInputData RetarderInputData
- //{
- // [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design",
- // "CA1065:DoNotRaiseExceptionsInUnexpectedLocations")]
- // get
- // {
- // if (Retarder == null) {
- // throw new InvalidFileFormatException("RetarderData not found");
- // }
- // return Retarder;
- // }
- //}
-
- //public virtual IDriverDeclarationInputData DriverInputData
- //{
- // get { return this; }
- //}
-
#endregion
#region IJobInputData
@@ -418,11 +306,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
get { return Body.GetEx(JsonKeys.Job_EngineOnlyMode).Value<bool>(); }
}
- //IVehicleDeclarationInputData IDeclarationJobInputData.Vehicle
- //{
- // get { return Vehicle; }
- //}
-
public virtual string JobName
{
get { return _jobname; }
@@ -432,17 +315,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
#region DriverInputData
- //IOverSpeedEcoRollDeclarationInputData IDriverDeclarationInputData.OverSpeedEcoRoll
- //{
- // get
- // {
- // var overspeed = Body.GetEx(JsonKeys.DriverData_OverspeedEcoRoll);
- // return new OverSpeedEcoRollInputData() {
- // Mode = DriverData.ParseDriverMode(overspeed.GetEx<string>(JsonKeys.DriverData_OverspeedEcoRoll_Mode))
- // };
- // }
- //}
-
public virtual ILookaheadCoastingInputData Lookahead
{
get {
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationInputDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationInputDataProvider.cs
index 27af6be5ac3abb891dbb62264ec6f006cd366523..ce93e7c08d4189255c1bea920b82f347765f3e2d 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationInputDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationInputDataProvider.cs
@@ -45,10 +45,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration
{
internal readonly XPathDocument Document;
- //private readonly IAuxiliariesDeclarationInputData XMLAuxiliaryData;
- //private readonly IDriverDeclarationInputData XMLDriverData;
private readonly XMLDeclarationJobInputDataProvider _xmlJobData;
- //protected internal readonly XMLDeclarationVehicleDataProvider _vehicleInputData;
public XMLDeclarationInputDataProvider(XmlReader inputData, bool verifyXml)
{
@@ -76,17 +73,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration
//CheckInputDocument();
_xmlJobData = new XMLDeclarationJobInputDataProvider(this);
- //_vehicleInputData = new XMLDeclarationVehicleDataProvider(this);
- //AirdragInputData = new XMLDeclarationAirdragDataProvider(this);
- //AxleGearInputData = new XMLDeclarationAxlegearDataProvider(this);
- //AngledriveInputData = new XMLDeclarationAngledriveDataProvider(this);
- //EngineInputData = new XMLDeclarationEngineDataProvider(this);
- //GearboxInputData = new XMLDeclarationGearboxDataProvider(this);
- //TorqueConverterInputData = new XMLDeclarationTorqueConverterDataProvider(this);
- //RetarderInputData = new XMLDeclarationRetarderDataProvider(this);
- //XMLDriverData = new XMLDeclarationDriverDataProvider(this);
- //XMLAuxiliaryData = new XMLDeclarationAuxiliaryDataProvider(this);
- //PTOTransmissionInputData = _vehicleInputData.GetPTOData();
}
private static void ValidationCallBack(object sender, ValidationEventArgs args)
@@ -117,37 +103,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration
get { return _xmlJobData; }
}
- //public IVehicleDeclarationInputData VehicleInputData
- //{
- // get { return _vehicleInputData; }
- //}
-
- //public IAirdragDeclarationInputData AirdragInputData { get; private set; }
-
- //public IGearboxDeclarationInputData GearboxInputData { get; private set; }
-
- //public ITorqueConverterDeclarationInputData TorqueConverterInputData { get; private set; }
-
- //public IAxleGearInputData AxleGearInputData { get; private set; }
-
- //public IAngledriveInputData AngledriveInputData { get; private set; }
-
- //public IEngineDeclarationInputData EngineInputData { get; private set; }
-
- //public IAuxiliariesDeclarationInputData AuxiliaryInputData()
- //{
- // return XMLAuxiliaryData;
- //}
-
- //public IRetarderInputData RetarderInputData { get; private set; }
-
- //public IDriverDeclarationInputData DriverInputData
- //{
- // get { return XMLDriverData; }
- //}
-
- //public IPTOTransmissionInputData PTOTransmissionInputData { get; private set; }
-
public XElement XMLHash { get; private set; }
}
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/XMLEngineeringInputDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/XMLEngineeringInputDataProvider.cs
index daaa388879a0e3fde41ac122d0243566f370ac16..e7083336b72004a21083836fd9b776b7dd9193e8 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/XMLEngineeringInputDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/XMLEngineeringInputDataProvider.cs
@@ -55,9 +55,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering
public XmlReaderSettings Settings { get; private set; }
- //protected internal XMLEngineeringAuxiliaryDataProvider XMLEngineeringAuxiliaryData;
- //protected internal XMLEngineeringAxlegearDataProvider AxlegearData;
-
public XMLEngineeringInputDataProvider(string filename, bool verifyXml)
{
FileName = filename;
@@ -136,15 +133,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering
ReadVehicle(Settings);
XMLEngineeringDriverData = XMLEngineeringJobData.GetDriverData();
- //AxlegearData = VehicleData.GetAxleGearInputData(settings);
- //AngledriveInputData = VehicleData.GetAngularGearInputData();
- //EngineInputData = VehicleData.GetEngineInputData(settings);
- //RetarderInputData = VehicleData.GetRetarderInputData(settings);
- //XMLEngineeringAuxiliaryData = VehicleData.GetAuxiliaryData(settings);
- //GearboxInputData = VehicleData.GetGearboxData(settings);
- //TorqueConverterInputData = GearboxInputData.TorqueConverter;
- //PTOTransmissionInputData = VehicleData.GetPTOData();
- //AirdragInputData = VehicleData.GetAirdragInputData(settings);
}
private static void ValidationCallBack(object sender, ValidationEventArgs args)
@@ -216,34 +204,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering
get { return VehicleData; }
}
- //public IAirdragEngineeringInputData AirdragInputData { get; private set; }
-
-
- //public IGearboxEngineeringInputData GearboxInputData { get; private set; }
-
- //public ITorqueConverterEngineeringInputData TorqueConverterInputData { get; private set; }
-
- //public IAxleGearInputData AxleGearInputData
- //{
- // get { return AxlegearData; }
- //}
-
- //public IAngledriveInputData AngledriveInputData { get; private set; }
-
public IEngineEngineeringInputData EngineOnlyInputData { get; private set; }
- //public IAuxiliariesEngineeringInputData AuxiliaryInputData()
- //{
- // return XMLEngineeringAuxiliaryData;
- //}
-
- //public IRetarderInputData RetarderInputData { get; private set; }
-
public IDriverEngineeringInputData DriverInputData
{
get { return XMLEngineeringDriverData; }
}
-
- //public IPTOTransmissionInputData PTOTransmissionInputData { get; private set; }
}
}