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 b547726b authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

adding vecto run data to result entry, use iresultentry interface instead of special class

parent 231075d1
Branches
Tags
No related merge requests found
...@@ -74,6 +74,8 @@ namespace TUGraz.VectoCore.OutputData ...@@ -74,6 +74,8 @@ namespace TUGraz.VectoCore.OutputData
{ {
void Initialize(VectoRunData vectoRunData); void Initialize(VectoRunData vectoRunData);
VectoRunData VectoRunData { get; }
VectoRun.Status Status { get; } VectoRun.Status Status { get; }
VectoRunData.OvcHevMode OVCMode { get; } VectoRunData.OvcHevMode OVCMode { get; }
......
...@@ -6,7 +6,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF ...@@ -6,7 +6,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
public interface IXMLVehicleInformationFile public interface IXMLVehicleInformationFile
{ {
void Initialize(VectoRunData modelData); void Initialize(VectoRunData modelData);
void WriteResult(XMLDeclarationReport.ResultEntry result); void WriteResult(IResultEntry result);
void GenerateReport(XElement fullReportHash); void GenerateReport(XElement fullReportHash);
XDocument Report { get; } XDocument Report { get; }
XNamespace Tns { get; } XNamespace Tns { get; }
......
...@@ -64,7 +64,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF ...@@ -64,7 +64,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
} }
public void WriteResult(XMLDeclarationReport.ResultEntry result) public void WriteResult(IResultEntry result)
{ {
_results.Add(result); _results.Add(result);
} }
......
...@@ -43,7 +43,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF ...@@ -43,7 +43,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
} }
public override void WriteResult(XMLDeclarationReport.ResultEntry result) public override void WriteResult(IResultEntry result)
{ {
// no results for exempted vehicle // no results for exempted vehicle
} }
......
...@@ -531,7 +531,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF ...@@ -531,7 +531,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
}; };
} }
public virtual void WriteResult(XMLDeclarationReport.ResultEntry resultEntry) public virtual void WriteResult(IResultEntry resultEntry)
{ {
_allSuccess &= resultEntry.Status == VectoRun.Status.Success; _allSuccess &= resultEntry.Status == VectoRun.Status.Success;
...@@ -566,7 +566,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF ...@@ -566,7 +566,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
GetResults(resultEntry))); GetResults(resultEntry)));
} }
private object[] GetResults(XMLDeclarationReport.ResultEntry resultEntry) private object[] GetResults(IResultEntry resultEntry)
{ {
switch (resultEntry.Status) { switch (resultEntry.Status) {
case VectoRun.Status.Pending: case VectoRun.Status.Pending:
...@@ -582,7 +582,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF ...@@ -582,7 +582,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
} }
} }
private object[] GetSuccessResultEntry(XMLDeclarationReport.ResultEntry result) private object[] GetSuccessResultEntry(IResultEntry result)
{ {
var retVal = new List<XElement>(); var retVal = new List<XElement>();
......
...@@ -95,19 +95,22 @@ namespace TUGraz.VectoCore.OutputData.XML ...@@ -95,19 +95,22 @@ namespace TUGraz.VectoCore.OutputData.XML
MaxChargingPower = runData.MaxChargingPower; MaxChargingPower = runData.MaxChargingPower;
BatteryData = runData.BatteryData; BatteryData = runData.BatteryData;
OVCMode = runData.OVCMode; OVCMode = runData.OVCMode;
VectoRunData = runData;
} }
public MissionType Mission { get; set; } public VectoRunData VectoRunData { get; private set; }
public LoadingType LoadingType { get; set; }
public int FuelMode { get; set; } public MissionType Mission { get; private set; }
public LoadingType LoadingType { get; private set; }
public int FuelMode { get; private set; }
public IList<IFuelProperties> FuelData { get; set; } public IList<IFuelProperties> FuelData { get; set; }
public Kilogram Payload { get; set; } public Kilogram Payload { get; set; }
public Kilogram TotalVehicleMass { get; set; } public Kilogram TotalVehicleMass { get; private set; }
public CubicMeter CargoVolume { get; set; } public CubicMeter CargoVolume { get; private set; }
public double? PassengerCount { get; set; } public double? PassengerCount { get; set; }
public VehicleClass VehicleClass { get; set; } public VehicleClass VehicleClass { get; set; }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment