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

Merge pull request #444 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:develop to develop

* commit '045d4aa9':
  fix: default engine data for GUI validation
  fix: output xml - distance in km
  adapt rated speed in generic vehicle
parents 08e3f4ab 045d4aa9
No related branches found
No related tags found
No related merge requests found
......@@ -19,7 +19,7 @@
"CFRegPer": 1.0,
"CFNCV": 1.0,
"RatedPower": 325000.0,
"RatedSpeed": 1600.0,
"RatedSpeed": 1800.0,
"MaxTorque": 2400.0,
"FuelType": 0,
"FullLoadCurve": "325kW.vfld",
......
......@@ -258,6 +258,7 @@ Public Class Gearbox
writer.WriteLine("engine speed, full load torque, motoring torque")
writer.WriteLine(" 500, 2000, -500")
writer.WriteLine("2500, 2000, -500")
writer.WriteLine("3000, 0, -500")
writer.Flush()
fldData.Seek(0, SeekOrigin.Begin)
Dim retVal As CombustionEngineData = New CombustionEngineData() With {
......@@ -267,7 +268,7 @@ Public Class Gearbox
Dim fldCurve As EngineFullLoadCurve = FullLoadCurveReader.Create(VectoCSVFile.ReadStream(fldData))
Dim fullLoadCurves As Dictionary(Of UInteger, EngineFullLoadCurve) =
New Dictionary(Of UInteger, EngineFullLoadCurve)()
fullLoadCurves(0) = FullLoadCurveReader.Create(VectoCSVFile.ReadStream(fldData))
fullLoadCurves(0) = fldCurve
fullLoadCurves(0).EngineData = retVal
For i As Integer = 0 To gears.Count - 1
fullLoadCurves(CType(i + 1, UInteger)) = AbstractSimulationDataAdapter.IntersectFullLoadCurves(fullLoadCurves(0),
......
......@@ -297,7 +297,7 @@ namespace TUGraz.VectoCore.OutputData.XML
private object[] GetSuccessResultEntry(XMLDeclarationReport.ResultEntry result)
{
return new object[] {
new XElement(tns + "Distance", new XAttribute("unit", "km"), result.Distance.ToXMLFormat(1)),
new XElement(tns + "Distance", new XAttribute("unit", "km"), result.Distance.ConvertTo().Kilo.Meter.ToXMLFormat(3)),
new XElement(tns + "SimulationParameters",
new XElement(tns + "TotalVehicleMass", new XAttribute("unit", "kg"), result.TotalVehicleWeight.ToXMLFormat(0)),
new XElement(tns + "Payload", new XAttribute("unit", "kg"), result.Payload.ToXMLFormat(0)),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment