diff --git a/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vveh b/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vveh
index bb48217191180d08eaa969bd63aa25e7943ddbcb..e3e08b9467f9ae6033480899991c9d482170c29d 100644
--- a/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vveh
+++ b/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vveh
@@ -22,7 +22,7 @@
"Ratio": 1.0,
"File": "<NOFILE>"
},
- "AngularGear": {
+ "Angledrive": {
"Type": "None",
"Ratio": 0.0,
"LossMap": "<NOFILE>"
diff --git a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vveh b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vveh
index 84f1e6edd1250e0e05eef5ba3d7143031fb25167..5efe0088e6881e473715a49bffbdf41e5a85e67a 100644
--- a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vveh
+++ b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vveh
@@ -23,10 +23,10 @@
"Ratio": 1.0,
"File": "Retarder.vrlm"
},
- "AngularGear": {
- "Type": "SeparateAngularGear",
+ "Angledrive": {
+ "Type": "SeparateAngledrive",
"Ratio": 1.0,
- "LossMap": "AngularGear.vtlm"
+ "LossMap": "Angledrive.vtlm"
},
"AxleConfig": {
"Type": "4x2",
diff --git a/VECTO/GUI/VehicleForm.Designer.vb b/VECTO/GUI/VehicleForm.Designer.vb
index 6f747143bc772fdf39eb074cd7086a64f4f2c5ad..51b04da0fb5bdd014a2143978a00490bcd368ac6 100644
--- a/VECTO/GUI/VehicleForm.Designer.vb
+++ b/VECTO/GUI/VehicleForm.Designer.vb
@@ -1,4 +1,4 @@
-' Copyright 2014 European Union.
+' Copyright 2014 European Union.
' Licensed under the EUPL (the 'Licence');
'
' * You may not use this work except in compliance with the Licence.
@@ -119,14 +119,14 @@ Partial Class VehicleForm
Me.cbPTOType = New System.Windows.Forms.ComboBox()
Me.GroupBox3 = New System.Windows.Forms.GroupBox()
Me.GroupBox2 = New System.Windows.Forms.GroupBox()
- Me.pnAngularGearFields = New System.Windows.Forms.Panel()
+ Me.pnAngledriveFields = New System.Windows.Forms.Panel()
Me.Label4 = New System.Windows.Forms.Label()
Me.Label12 = New System.Windows.Forms.Label()
Me.Label10 = New System.Windows.Forms.Label()
- Me.tbAngularGearRatio = New System.Windows.Forms.TextBox()
- Me.btAngularGearLossMapBrowse = New System.Windows.Forms.Button()
- Me.tbAngularGearLossMapPath = New System.Windows.Forms.TextBox()
- Me.cbAngularGearType = New System.Windows.Forms.ComboBox()
+ Me.tbAngledriveRatio = New System.Windows.Forms.TextBox()
+ Me.btAngledriveLossMapBrowse = New System.Windows.Forms.Button()
+ Me.tbAngledriveLossMapPath = New System.Windows.Forms.TextBox()
+ Me.cbAngledriveType = New System.Windows.Forms.ComboBox()
Me.PicVehicle = New System.Windows.Forms.PictureBox()
Me.Label8 = New System.Windows.Forms.Label()
Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
@@ -148,7 +148,7 @@ Partial Class VehicleForm
Me.pnPTO.SuspendLayout()
Me.GroupBox3.SuspendLayout()
Me.GroupBox2.SuspendLayout()
- Me.pnAngularGearFields.SuspendLayout()
+ Me.pnAngledriveFields.SuspendLayout()
CType(Me.PicVehicle, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
@@ -929,8 +929,8 @@ Partial Class VehicleForm
'
'GroupBox2
'
- Me.GroupBox2.Controls.Add(Me.pnAngularGearFields)
- Me.GroupBox2.Controls.Add(Me.cbAngularGearType)
+ Me.GroupBox2.Controls.Add(Me.pnAngledriveFields)
+ Me.GroupBox2.Controls.Add(Me.cbAngledriveType)
Me.GroupBox2.Location = New System.Drawing.Point(290, 295)
Me.GroupBox2.Name = "GroupBox2"
Me.GroupBox2.Size = New System.Drawing.Size(280, 111)
@@ -938,18 +938,18 @@ Partial Class VehicleForm
Me.GroupBox2.TabStop = False
Me.GroupBox2.Text = "Angular Gear"
'
- 'pnAngularGearFields
+ 'pnAngledriveFields
'
- Me.pnAngularGearFields.Controls.Add(Me.Label4)
- Me.pnAngularGearFields.Controls.Add(Me.Label12)
- Me.pnAngularGearFields.Controls.Add(Me.Label10)
- Me.pnAngularGearFields.Controls.Add(Me.tbAngularGearRatio)
- Me.pnAngularGearFields.Controls.Add(Me.btAngularGearLossMapBrowse)
- Me.pnAngularGearFields.Controls.Add(Me.tbAngularGearLossMapPath)
- Me.pnAngularGearFields.Location = New System.Drawing.Point(3, 42)
- Me.pnAngularGearFields.Name = "pnAngularGearFields"
- Me.pnAngularGearFields.Size = New System.Drawing.Size(272, 63)
- Me.pnAngularGearFields.TabIndex = 6
+ Me.pnAngledriveFields.Controls.Add(Me.Label4)
+ Me.pnAngledriveFields.Controls.Add(Me.Label12)
+ Me.pnAngledriveFields.Controls.Add(Me.Label10)
+ Me.pnAngledriveFields.Controls.Add(Me.tbAngledriveRatio)
+ Me.pnAngledriveFields.Controls.Add(Me.btAngledriveLossMapBrowse)
+ Me.pnAngledriveFields.Controls.Add(Me.tbAngledriveLossMapPath)
+ Me.pnAngledriveFields.Location = New System.Drawing.Point(3, 42)
+ Me.pnAngledriveFields.Name = "pnAngledriveFields"
+ Me.pnAngledriveFields.Size = New System.Drawing.Size(272, 63)
+ Me.pnAngledriveFields.TabIndex = 6
'
'Label4
'
@@ -979,41 +979,41 @@ Partial Class VehicleForm
Me.Label10.Text = "Ratio"
Me.Label10.TextAlign = System.Drawing.ContentAlignment.TopRight
'
- 'tbAngularGearRatio
+ 'tbAngledriveRatio
'
- Me.tbAngularGearRatio.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.tbAngularGearRatio.Location = New System.Drawing.Point(193, 2)
- Me.tbAngularGearRatio.Name = "tbAngularGearRatio"
- Me.tbAngularGearRatio.Size = New System.Drawing.Size(56, 20)
- Me.tbAngularGearRatio.TabIndex = 12
+ Me.tbAngledriveRatio.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.tbAngledriveRatio.Location = New System.Drawing.Point(193, 2)
+ Me.tbAngledriveRatio.Name = "tbAngledriveRatio"
+ Me.tbAngledriveRatio.Size = New System.Drawing.Size(56, 20)
+ Me.tbAngledriveRatio.TabIndex = 12
'
- 'btAngularGearLossMapBrowse
+ 'btAngledriveLossMapBrowse
'
- Me.btAngularGearLossMapBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
- Me.btAngularGearLossMapBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btAngularGearLossMapBrowse.Location = New System.Drawing.Point(245, 39)
- Me.btAngularGearLossMapBrowse.Name = "btAngularGearLossMapBrowse"
- Me.btAngularGearLossMapBrowse.Size = New System.Drawing.Size(24, 24)
- Me.btAngularGearLossMapBrowse.TabIndex = 14
- Me.btAngularGearLossMapBrowse.UseVisualStyleBackColor = True
+ Me.btAngledriveLossMapBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+ Me.btAngledriveLossMapBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
+ Me.btAngledriveLossMapBrowse.Location = New System.Drawing.Point(245, 39)
+ Me.btAngledriveLossMapBrowse.Name = "btAngledriveLossMapBrowse"
+ Me.btAngledriveLossMapBrowse.Size = New System.Drawing.Size(24, 24)
+ Me.btAngledriveLossMapBrowse.TabIndex = 14
+ Me.btAngledriveLossMapBrowse.UseVisualStyleBackColor = True
'
- 'tbAngularGearLossMapPath
+ 'tbAngledriveLossMapPath
'
- Me.tbAngularGearLossMapPath.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
- Me.tbAngularGearLossMapPath.Location = New System.Drawing.Point(6, 41)
- Me.tbAngularGearLossMapPath.Name = "tbAngularGearLossMapPath"
- Me.tbAngularGearLossMapPath.Size = New System.Drawing.Size(239, 20)
- Me.tbAngularGearLossMapPath.TabIndex = 13
+ Me.tbAngledriveLossMapPath.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+ Me.tbAngledriveLossMapPath.Location = New System.Drawing.Point(6, 41)
+ Me.tbAngledriveLossMapPath.Name = "tbAngledriveLossMapPath"
+ Me.tbAngledriveLossMapPath.Size = New System.Drawing.Size(239, 20)
+ Me.tbAngledriveLossMapPath.TabIndex = 13
'
- 'cbAngularGearType
+ 'cbAngledriveType
'
- Me.cbAngularGearType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
- Me.cbAngularGearType.FormattingEnabled = True
- Me.cbAngularGearType.Items.AddRange(New Object() {"No Angular Gear", "Separate Angular Gear", "Included in Transmission Loss Maps"})
- Me.cbAngularGearType.Location = New System.Drawing.Point(6, 19)
- Me.cbAngularGearType.Name = "cbAngularGearType"
- Me.cbAngularGearType.Size = New System.Drawing.Size(266, 21)
- Me.cbAngularGearType.TabIndex = 0
+ Me.cbAngledriveType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+ Me.cbAngledriveType.FormattingEnabled = True
+ Me.cbAngledriveType.Items.AddRange(New Object() {"No Angular Gear", "Separate Angular Gear", "Included in Transmission Loss Maps"})
+ Me.cbAngledriveType.Location = New System.Drawing.Point(6, 19)
+ Me.cbAngledriveType.Name = "cbAngledriveType"
+ Me.cbAngledriveType.Size = New System.Drawing.Size(266, 21)
+ Me.cbAngledriveType.TabIndex = 0
'
'PicVehicle
'
@@ -1089,8 +1089,8 @@ Partial Class VehicleForm
Me.pnPTO.PerformLayout()
Me.GroupBox3.ResumeLayout(False)
Me.GroupBox2.ResumeLayout(False)
- Me.pnAngularGearFields.ResumeLayout(False)
- Me.pnAngularGearFields.PerformLayout()
+ Me.pnAngledriveFields.ResumeLayout(False)
+ Me.pnAngledriveFields.PerformLayout()
CType(Me.PicVehicle, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
Me.PerformLayout()
@@ -1170,17 +1170,17 @@ Partial Class VehicleForm
Friend WithEvents PnCdATrTr As System.Windows.Forms.Panel
Friend WithEvents Label38 As System.Windows.Forms.Label
Friend WithEvents GroupBox2 As System.Windows.Forms.GroupBox
- Friend WithEvents cbAngularGearType As System.Windows.Forms.ComboBox
+ Friend WithEvents cbAngledriveType As System.Windows.Forms.ComboBox
Friend WithEvents Label15 As System.Windows.Forms.Label
Friend WithEvents BtRtBrowse As System.Windows.Forms.Button
Friend WithEvents TbRtPath As System.Windows.Forms.TextBox
- Friend WithEvents pnAngularGearFields As System.Windows.Forms.Panel
+ Friend WithEvents pnAngledriveFields As System.Windows.Forms.Panel
Friend WithEvents Label4 As System.Windows.Forms.Label
Friend WithEvents Label12 As System.Windows.Forms.Label
Friend WithEvents Label10 As System.Windows.Forms.Label
- Friend WithEvents tbAngularGearRatio As System.Windows.Forms.TextBox
- Friend WithEvents btAngularGearLossMapBrowse As System.Windows.Forms.Button
- Friend WithEvents tbAngularGearLossMapPath As System.Windows.Forms.TextBox
+ Friend WithEvents tbAngledriveRatio As System.Windows.Forms.TextBox
+ Friend WithEvents btAngledriveLossMapBrowse As System.Windows.Forms.Button
+ Friend WithEvents tbAngledriveLossMapPath As System.Windows.Forms.TextBox
Friend WithEvents ToolTip1 As System.Windows.Forms.ToolTip
Friend WithEvents GroupBox3 As System.Windows.Forms.GroupBox
Friend WithEvents Label7 As System.Windows.Forms.Label
diff --git a/VECTO/GUI/VehicleForm.vb b/VECTO/GUI/VehicleForm.vb
index d17350647b9b7e7880a7f573c2488dc458c70851..62243bff153875ca50a38877a8736d4f838a0a02 100644
--- a/VECTO/GUI/VehicleForm.vb
+++ b/VECTO/GUI/VehicleForm.vb
@@ -83,10 +83,10 @@ Public Class VehicleForm
.Cast(Of VehicleCategory) _
.Select(Function(category) New With {Key .Value = category, .label = category.GetLabel()}).ToList()
- cbAngularGearType.ValueMember = "Value"
- cbAngularGearType.DisplayMember = "Label"
- cbAngularGearType.DataSource = [Enum].GetValues(GetType(AngularGearType)) _
- .Cast(Of AngularGearType).Select(Function(type) New With {Key .Value = type, .Label = type.GetLabel()}).ToList()
+ cbAngledriveType.ValueMember = "Value"
+ cbAngledriveType.DisplayMember = "Label"
+ cbAngledriveType.DataSource = [Enum].GetValues(GetType(AngledriveType)) _
+ .Cast(Of AngledriveType).Select(Function(type) New With {Key .Value = type, .Label = type.GetLabel()}).ToList()
_axlDlog = New VehicleAxleDialog
cbPTOType.ValueMember = "Value"
@@ -325,7 +325,7 @@ Public Class VehicleForm
IEngineeringInputDataProvider)
Dim vehicle As IVehicleEngineeringInputData = inputData.VehicleInputData
Dim retarder As IRetarderInputData = inputData.RetarderInputData
- Dim angularGear As IAngularGearInputData = inputData.AngularGearInputData
+ Dim angledrive As IAngledriveInputData = inputData.AngledriveInputData
Dim pto As IPTOTransmissionInputData = inputData.PTOTransmissionInputData
If Cfg.DeclMode <> vehicle.SavedInDeclarationMode Then
@@ -358,10 +358,10 @@ Public Class VehicleForm
TbRtPath.Text = If(retarder.LossMap Is Nothing, "", GetRelativePath(retarder.LossMap.Source, basePath))
- cbAngularGearType.SelectedValue = angularGear.Type
- tbAngularGearRatio.Text = angularGear.Ratio.ToGUIFormat()
- tbAngularGearLossMapPath.Text =
- If(angularGear.LossMap Is Nothing, "", GetRelativePath(angularGear.LossMap.Source, basePath))
+ cbAngledriveType.SelectedValue = angledrive.Type
+ tbAngledriveRatio.Text = angledrive.IAngledriveInputData_Ratio.ToGUIFormat()
+ tbAngledriveLossMapPath.Text =
+ If(angledrive.IAngledriveInputData_LossMap Is Nothing, "", GetRelativePath(angledrive.IAngledriveInputData_LossMap.Source, basePath))
LvRRC.Items.Clear()
Dim i As Integer = 0
@@ -443,9 +443,9 @@ Public Class VehicleForm
veh.RetarderRatio = TbRtRatio.Text.ToDouble(0)
veh.RetarderLossMapFile.Init(GetPath(file), TbRtPath.Text)
- veh.AngularGearType = CType(cbAngularGearType.SelectedValue, AngularGearType)
- veh.AngularGearRatio = tbAngularGearRatio.Text.ToDouble(0)
- veh.AngularGearLossMapFile.Init(GetPath(file), tbAngularGearLossMapPath.Text)
+ veh.AngledriveType = CType(cbAngledriveType.SelectedValue, AngledriveType)
+ veh.AngledriveRatio = tbAngledriveRatio.Text.ToDouble(0)
+ veh.AngledriveLossMapFile.Init(GetPath(file), tbAngledriveLossMapPath.Text)
veh.VehicleCategory = CType(CbCat.SelectedValue, VehicleCategory) 'CType(CbCat.SelectedIndex, tVehCat)
@@ -613,8 +613,8 @@ Public Class VehicleForm
Private Sub TBcw_TextChanged(sender As Object, e As EventArgs) _
Handles TbLoad.TextChanged, TBrdyn.TextChanged, TBcdA.TextChanged, TbCdFile.TextChanged, TbRtRatio.TextChanged,
- cbAngularGearType.SelectedIndexChanged, TbRtPath.TextChanged, tbAngularGearLossMapPath.TextChanged,
- tbAngularGearRatio.TextChanged, tbPTOLossMap.TextChanged
+ cbAngledriveType.SelectedIndexChanged, TbRtPath.TextChanged, tbAngledriveLossMapPath.TextChanged,
+ tbAngledriveRatio.TextChanged, tbPTOLossMap.TextChanged
Change()
End Sub
@@ -781,23 +781,23 @@ Public Class VehicleForm
#Region "Angular Gear"
- Private Sub cbAngularGearType_SelectedIndexChanged(sender As Object, e As EventArgs) _
- Handles cbAngularGearType.SelectedIndexChanged
- Select Case CType(cbAngularGearType.SelectedValue, AngularGearType)
- Case AngularGearType.SeparateAngularGear
- pnAngularGearFields.Enabled = True
- tbAngularGearRatio.Text = "1.0"
+ Private Sub cbAngledriveType_SelectedIndexChanged(sender As Object, e As EventArgs) _
+ Handles cbAngledriveType.SelectedIndexChanged
+ Select Case CType(cbAngledriveType.SelectedValue, AngledriveType)
+ Case AngledriveType.SeparateAngledrive
+ pnAngledriveFields.Enabled = True
+ tbAngledriveRatio.Text = "1.0"
Case Else 'Losses included in Transmission, None
- tbAngularGearRatio.Text = ""
- tbAngularGearLossMapPath.Text = ""
- pnAngularGearFields.Enabled = False
+ tbAngledriveRatio.Text = ""
+ tbAngledriveLossMapPath.Text = ""
+ pnAngledriveFields.Enabled = False
End Select
Change()
End Sub
- Private Sub btAngularGearLossMapBrowse_Click(sender As Object, e As EventArgs) Handles btAngularGearLossMapBrowse.Click
+ Private Sub btAngledriveLossMapBrowse_Click(sender As Object, e As EventArgs) Handles btAngledriveLossMapBrowse.Click
If TransmissionLossMapFileBrowser.OpenDialog(FileRepl(TbRtPath.Text, GetPath(_vehFile))) Then _
- tbAngularGearLossMapPath.Text = GetFilenameWithoutDirectory(TransmissionLossMapFileBrowser.Files(0),
+ tbAngledriveLossMapPath.Text = GetFilenameWithoutDirectory(TransmissionLossMapFileBrowser.Files(0),
GetPath(_vehFile))
End Sub
diff --git a/VECTO/Input Files/VectoJob.vb b/VECTO/Input Files/VectoJob.vb
index 7eb0020e01eff8e2256136933653c9b2e72ec87a..326f511c81372c1dd2aecb1d42dc8264212a2271 100644
--- a/VECTO/Input Files/VectoJob.vb
+++ b/VECTO/Input Files/VectoJob.vb
@@ -755,17 +755,17 @@ Public Class VectoJob
End Get
End Property
- Public ReadOnly Property IDeclarationInputDataProvider_AngularGearInputData As IAngularGearInputData _
- Implements IDeclarationInputDataProvider.AngularGearInputData
+ Public ReadOnly Property DeclarationInputDataProviderAngledriveInputData As IAngledriveInputData _
+ Implements IDeclarationInputDataProvider.AngledriveInputData
Get
- Return _vehicleInputData.AngularGearInputData
+ Return _vehicleInputData.AngledriveInputData
End Get
End Property
- Public ReadOnly Property AngularGearInputData As IAngularGearInputData _
- Implements IEngineeringInputDataProvider.AngularGearInputData
+ Public ReadOnly Property AngledriveInputData As IAngledriveInputData _
+ Implements IEngineeringInputDataProvider.AngledriveInputData
Get
- Return _vehicleInputData.AngularGearInputData
+ Return _vehicleInputData.AngledriveInputData
End Get
End Property
diff --git a/VECTO/Input Files/Vehicle.vb b/VECTO/Input Files/Vehicle.vb
index d67e58fa65e4fd3b123b451ca14b0a4533e5c18a..e47fe482fdec66ab93c7f5adcc43a265c8eff2cf 100644
--- a/VECTO/Input Files/Vehicle.vb
+++ b/VECTO/Input Files/Vehicle.vb
@@ -28,7 +28,7 @@ Imports TUGraz.VectoCore.Utils
<CustomValidation(GetType(Vehicle), "ValidateVehicle")>
Public Class Vehicle
Implements IVehicleEngineeringInputData, IVehicleDeclarationInputData, IRetarderInputData, IPTOTransmissionInputData,
- IAngularGearInputData
+ IAngledriveInputData
'V2 MassMax is now saved in [t] instead of [kg]
Private Const FormatVersion As Short = 7
@@ -57,9 +57,9 @@ Public Class Vehicle
Public AxleConfiguration As AxleConfiguration
Public SavedInDeclMode As Boolean
- Public AngularGearType As AngularGearType
- Public AngularGearRatio As Double
- Public ReadOnly AngularGearLossMapFile As SubPath
+ Public AngledriveType As AngledriveType
+ Public AngledriveRatio As Double
+ Public ReadOnly AngledriveLossMapFile As SubPath
Public PtoType As String
Public ReadOnly PtoLossMap As SubPath
@@ -81,7 +81,7 @@ Public Class Vehicle
CrossWindCorrectionFile = New SubPath
RetarderLossMapFile = New SubPath
- AngularGearLossMapFile = New SubPath()
+ AngledriveLossMapFile = New SubPath()
Axles = New List(Of Axle)
PtoLossMap = New SubPath()
@@ -96,7 +96,7 @@ Public Class Vehicle
Dim vehicleData As VehicleData
Dim retarderData As RetarderData
Dim ptoData As PTOData = Nothing
- Dim angledriveData As AngularGearData
+ Dim angledriveData As AngledriveData
Dim modeService As ExecutionModeServiceContainer = TryCast(validationContext.GetService(GetType(ExecutionMode)),
ExecutionModeServiceContainer)
@@ -110,12 +110,12 @@ Public Class Vehicle
vehicleData = doa.CreateVehicleData(vehicle, segment.Missions.First(),
segment.Missions.First().Loadings.First().Value)
retarderData = doa.CreateRetarderData(vehicle)
- angledriveData = doa.CreateAngularGearData(vehicle, False)
+ angledriveData = doa.CreateAngledriveData(vehicle, False)
Else
Dim doa As EngineeringDataAdapter = New EngineeringDataAdapter()
vehicleData = doa.CreateVehicleData(vehicle)
retarderData = doa.CreateRetarderData(vehicle)
- angledriveData = doa.CreateAngularGearData(vehicle, True)
+ angledriveData = doa.CreateAngledriveData(vehicle, True)
ptoData = doa.CreatePTOTransmissionData(vehicle)
End If
@@ -132,7 +132,7 @@ Public Class Vehicle
New ValidationResult("Retarder Configuration is invalid. ", result.Select(Function(r) r.ErrorMessage).ToList())
End If
- If vehicle.AngularGearType = AngularGearType.SeparateAngularGear Then
+ If vehicle.AngledriveType = AngledriveType.SeparateAngledrive Then
result = angledriveData.Validate(If(Cfg.DeclMode, ExecutionMode.Declaration, ExecutionMode.Engineering))
If result.Any() Then
Return _
@@ -170,11 +170,11 @@ Public Class Vehicle
RetarderType = RetarderType.None
RetarderRatio = 1
RetarderLossMapFile.Clear()
- AngularGearLossMapFile.Clear()
+ AngledriveLossMapFile.Clear()
- AngularGearType = AngularGearType.None
- AngularGearLossMapFile.Clear()
- AngularGearRatio = 1
+ AngledriveType = AngledriveType.None
+ AngledriveLossMapFile.Clear()
+ AngledriveRatio = 1
PtoType = PTOTransmission.NoPTO
PtoLossMap.Clear()
@@ -227,10 +227,10 @@ Public Class Vehicle
{"Type", RetarderType.GetName()},
{"Ratio", RetarderRatio},
{"File", RetarderLossMapFile.PathOrDummy}}},
- {"AngularGear", New Dictionary(Of String, Object) From {
- {"Type", AngularGearType.ToString()},
- {"Ratio", AngularGearRatio},
- {"LossMap", AngularGearLossMapFile.PathOrDummy}}},
+ {"Angledrive", New Dictionary(Of String, Object) From {
+ {"Type", AngledriveType.ToString()},
+ {"Ratio", AngledriveRatio},
+ {"LossMap", AngledriveLossMapFile.PathOrDummy}}},
{"PTO", New Dictionary(Of String, Object) From {
{"Type", PtoType},
{"LossMap", PtoLossMap.PathOrDummy},
@@ -437,15 +437,15 @@ Public Class Vehicle
End Get
End Property
- Public ReadOnly Property IAngularGearInputData_Ratio As Double Implements IAngularGearInputData.Ratio
+ Public ReadOnly Property IAngledriveInputData_Ratio As Double Implements IAngledriveInputData.IAngledriveInputData_Ratio
Get
- Return AngularGearRatio
+ Return AngledriveRatio
End Get
End Property
- Public ReadOnly Property IAngularGearInputData_Type As AngularGearType Implements IAngularGearInputData.Type
+ Public ReadOnly Property AngledriveInputDataType As AngledriveType Implements IAngledriveInputData.Type
Get
- Return AngularGearType
+ Return AngledriveType
End Get
End Property
@@ -455,9 +455,9 @@ Public Class Vehicle
End Get
End Property
- Public ReadOnly Property IAngularGearInputData_LossMap As TableData Implements IAngularGearInputData.LossMap
+ Public ReadOnly Property IAngledriveInputData_LossMap As TableData Implements IAngledriveInputData.IAngledriveInputData_LossMap
Get
- Return VectoCSVFile.Read(AngularGearLossMapFile.FullPath)
+ Return VectoCSVFile.Read(AngledriveLossMapFile.FullPath)
End Get
End Property
@@ -467,9 +467,9 @@ Public Class Vehicle
End Get
End Property
- Public ReadOnly Property Efficiency As Double Implements IAngularGearInputData.Efficiency
+ Public ReadOnly Property Efficiency As Double Implements IAngledriveInputData.Efficiency
Get
- Return If(IsNumeric(AngularGearLossMapFile.OriginalPath), AngularGearLossMapFile.OriginalPath.ToDouble(), -1.0)
+ Return If(IsNumeric(AngledriveLossMapFile.OriginalPath), AngledriveLossMapFile.OriginalPath.ToDouble(), -1.0)
End Get
End Property
diff --git a/VECTO/VECTO.vbproj.user b/VECTO/VECTO.vbproj.user
index 42332ddfe40b4130cde45e54191b1ad52cad539b..de2f13e5e6ff4cff869eb443faa8215d3edaca41 100644
--- a/VECTO/VECTO.vbproj.user
+++ b/VECTO/VECTO.vbproj.user
@@ -13,7 +13,7 @@
<FallbackCulture>de-DE</FallbackCulture>
<VerifyUploadedFiles>false</VerifyUploadedFiles>
<ErrorReportUrlHistory />
- <ProjectView>ProjectFiles</ProjectView>
+ <ProjectView>ShowAllFiles</ProjectView>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<StartArguments>
diff --git a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
index bbc06175f338f3274c583030474c2d43f37ca4ea..58ebd0d46da776a960806b4dea14c1a10619778e 100644
--- a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
@@ -135,22 +135,22 @@ namespace TUGraz.VectoCommon.InputData
TableData LossMap { get; }
}
- public interface IAngularGearInputData : IComponentInputData
+ public interface IAngledriveInputData : IComponentInputData
{
/// <summary>
/// P180
/// </summary>
- AngularGearType Type { get; }
+ AngledriveType Type { get; }
/// <summary>
/// P176
/// </summary>
- double Ratio { get; }
+ double IAngledriveInputData_Ratio { get; }
/// <summary>
/// P173, P174, P175
/// </summary>
- TableData LossMap { get; }
+ TableData IAngledriveInputData_LossMap { get; }
/// <summary>
/// P177
diff --git a/VectoCommon/VectoCommon/InputData/IInputDataProvider.cs b/VectoCommon/VectoCommon/InputData/IInputDataProvider.cs
index 64860093cbae0d3c160d0dcd2485898e9d85ac1c..5f60f23ffe7cfbfd697539e2f8d10beafa1f99a1 100644
--- a/VectoCommon/VectoCommon/InputData/IInputDataProvider.cs
+++ b/VectoCommon/VectoCommon/InputData/IInputDataProvider.cs
@@ -45,7 +45,7 @@ namespace TUGraz.VectoCommon.InputData
IAxleGearInputData AxleGearInputData { get; }
- IAngularGearInputData AngularGearInputData { get; }
+ IAngledriveInputData AngledriveInputData { get; }
IEngineDeclarationInputData EngineInputData { get; }
@@ -68,7 +68,7 @@ namespace TUGraz.VectoCommon.InputData
IAxleGearInputData AxleGearInputData { get; }
- IAngularGearInputData AngularGearInputData { get; }
+ IAngledriveInputData AngledriveInputData { get; }
IEngineEngineeringInputData EngineInputData { get; }
diff --git a/VectoCommon/VectoCommon/Models/AngularGearType.cs b/VectoCommon/VectoCommon/Models/AngledriveType.cs
similarity index 86%
rename from VectoCommon/VectoCommon/Models/AngularGearType.cs
rename to VectoCommon/VectoCommon/Models/AngledriveType.cs
index 3bad8a86ccf2b801350e8cdac1792e947820e775..8db26a86f634781b1e5a905de9e13ab148a3230d 100644
--- a/VectoCommon/VectoCommon/Models/AngularGearType.cs
+++ b/VectoCommon/VectoCommon/Models/AngledriveType.cs
@@ -33,23 +33,23 @@ using System;
namespace TUGraz.VectoCommon.Models
{
- public enum AngularGearType
+ public enum AngledriveType
{
None,
- SeparateAngularGear,
+ SeparateAngledrive,
LossesIncludedInGearbox,
}
- public static class AngularGearTypeHelper
+ public static class AngledriveTypeHelper
{
- public static string GetLabel(this AngularGearType type)
+ public static string GetLabel(this AngledriveType type)
{
switch (type) {
- case AngularGearType.None:
+ case AngledriveType.None:
return "No Angular Gear";
- case AngularGearType.SeparateAngularGear:
+ case AngledriveType.SeparateAngledrive:
return "Separate Angular Gear";
- case AngularGearType.LossesIncludedInGearbox:
+ case AngledriveType.LossesIncludedInGearbox:
return "Included in Transmission Loss Maps";
default:
throw new ArgumentOutOfRangeException("type", type, null);
diff --git a/VectoCommon/VectoCommon/Models/IResponse.cs b/VectoCommon/VectoCommon/Models/IResponse.cs
index f2252936aae39d16abd00544e7393fb1a8e0e9d1..3af5cdf015d6f1dfce670cb54cdbcfe607b07912 100644
--- a/VectoCommon/VectoCommon/Models/IResponse.cs
+++ b/VectoCommon/VectoCommon/Models/IResponse.cs
@@ -53,7 +53,7 @@ namespace TUGraz.VectoCommon.Models
Watt WheelsPowerRequest { get; set; }
Watt VehiclePowerRequest { get; set; }
Watt BrakePower { get; set; }
- Watt AngularGearPowerRequest { get; set; }
+ Watt AngledrivePowerRequest { get; set; }
Watt AuxiliariesPowerDemand { get; set; }
}
diff --git a/VectoCommon/VectoCommon/VectoCommon.csproj b/VectoCommon/VectoCommon/VectoCommon.csproj
index 767d0d4874514eb826aa59d86499fc953d7e02dc..b0036079b3dc1a950d06f3706d3bd738774d2e81 100644
--- a/VectoCommon/VectoCommon/VectoCommon.csproj
+++ b/VectoCommon/VectoCommon/VectoCommon.csproj
@@ -56,7 +56,7 @@
<Compile Include="InputData\IInputDataProvider.cs" />
<Compile Include="InputData\IntegrityStatus.cs" />
<Compile Include="Models\AuxiliaryDemandType.cs" />
- <Compile Include="Models\AngularGearType.cs" />
+ <Compile Include="Models\AngledriveType.cs" />
<Compile Include="Models\AuxiliaryModel.cs" />
<Compile Include="Models\AxleConfiguration.cs" />
<Compile Include="Models\CrossWindCorrectionMode.cs" />
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
index e9ec1f8864b116ddd539091e35d6547a709000c6..945d1866a24a98145dfe58bf02fd76f6e3ffdf28 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
@@ -11,7 +11,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
protected IGearboxEngineeringInputData Gearbox;
protected IAxleGearInputData AxleGear;
protected ITorqueConverterEngineeringInputData TorqueConverter;
- protected IAngularGearInputData AngularGear;
+ protected IAngledriveInputData Angledrive;
protected IEngineEngineeringInputData Engine;
protected IVehicleEngineeringInputData VehicleData;
protected IRetarderInputData Retarder;
@@ -40,7 +40,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
.If<IAxleGearInputData>(c => AxleGear = c)
.If<IRetarderInputData>(c => Retarder = c)
.If<ITorqueConverterEngineeringInputData>(c => TorqueConverter = c)
- .If<IAngularGearInputData>(c => AngularGear = c)
+ .If<IAngledriveInputData>(c => Angledrive = c)
.If<IPTOTransmissionInputData>(c => PTOTransmission = c);
}
@@ -91,9 +91,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
get { return AxleGear; }
}
- public IAngularGearInputData AngularGearInputData
+ public IAngledriveInputData AngledriveInputData
{
- get { return AngularGear; }
+ get { return Angledrive; }
}
IEngineDeclarationInputData IDeclarationInputDataProvider.EngineInputData
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
index c6b764db12e6f025f0e26bfec91969c581e71afd..a33d148b64b38e9de23990c67770db6a8711b27b 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
@@ -117,7 +117,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
protected readonly IGearboxEngineeringInputData Gearbox;
protected readonly IAxleGearInputData AxleGear;
protected readonly ITorqueConverterEngineeringInputData TorqueConverter;
- protected readonly IAngularGearInputData AngularGear;
+ protected readonly IAngledriveInputData Angledrive;
protected readonly IEngineEngineeringInputData Engine;
protected readonly IVehicleEngineeringInputData VehicleData;
protected readonly IRetarderInputData Retarder;
@@ -154,7 +154,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
VehicleData = JSONInputDataFactory.ReadJsonVehicle(
Path.Combine(BasePath, vehicleFile));
- AngularGear = VehicleData as IAngularGearInputData;
+ Angledrive = VehicleData as IAngledriveInputData;
Retarder = VehicleData as IRetarderInputData;
PTOTransmission = VehicleData as IPTOTransmissionInputData;
}
@@ -241,9 +241,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
}
}
- public IAngularGearInputData AngularGearInputData
+ public IAngledriveInputData AngledriveInputData
{
- get { return AngularGear; }
+ get { return Angledrive; }
}
IEngineDeclarationInputData IDeclarationInputDataProvider.EngineInputData
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
index 45c648a28899dbef63415149d2a08323f67fad88..36fa97ad0557840f7c3bbe7e804f36e9d3f18888 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
@@ -41,7 +41,7 @@ using TUGraz.VectoCore.InputData.Impl;
namespace TUGraz.VectoCore.InputData.FileIO.JSON
{
- public class JSONVehicleDataV7 : JSONFile, IVehicleEngineeringInputData, IRetarderInputData, IAngularGearInputData,
+ public class JSONVehicleDataV7 : JSONFile, IVehicleEngineeringInputData, IRetarderInputData, IAngledriveInputData,
IPTOTransmissionInputData
{
public JSONVehicleDataV7(JObject data, string fileName) : base(data, fileName) {}
@@ -165,40 +165,40 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
#endregion
- #region IAngularGearInputData
+ #region IAngledriveInputData
- AngularGearType IAngularGearInputData.Type
+ AngledriveType IAngledriveInputData.Type
{
get
{
- var angleDrive = Body[JsonKeys.Vehicle_AngularGear];
+ var angleDrive = Body[JsonKeys.Vehicle_Angledrive];
if (angleDrive == null) {
- return AngularGearType.None;
+ return AngledriveType.None;
}
- return angleDrive.GetEx<string>(JsonKeys.Vehicle_AngularGear_Type).ParseEnum<AngularGearType>();
+ return angleDrive.GetEx<string>(JsonKeys.Vehicle_Angledrive_Type).ParseEnum<AngledriveType>();
}
}
- double IAngularGearInputData.Ratio
+ double IAngledriveInputData.IAngledriveInputData_Ratio
{
- get { return Body.GetEx(JsonKeys.Vehicle_AngularGear).GetEx<double>(JsonKeys.Vehicle_AngularGear_Ratio); }
+ get { return Body.GetEx(JsonKeys.Vehicle_Angledrive).GetEx<double>(JsonKeys.Vehicle_Angledrive_Ratio); }
}
- TableData IAngularGearInputData.LossMap
+ TableData IAngledriveInputData.IAngledriveInputData_LossMap
{
get
{
return ReadTableData(
- Body.GetEx(JsonKeys.Vehicle_AngularGear)
- .GetEx<string>(JsonKeys.Vehicle_AngularGear_LossMapFile),
+ Body.GetEx(JsonKeys.Vehicle_Angledrive)
+ .GetEx<string>(JsonKeys.Vehicle_Angledrive_LossMapFile),
"LossMap", false);
}
}
- double IAngularGearInputData.Efficiency
+ double IAngledriveInputData.Efficiency
{
- get { return Body.GetEx(JsonKeys.Vehicle_AngularGear).GetEx<double>(JsonKeys.Vehicle_AngularGear_Efficiency); }
+ get { return Body.GetEx(JsonKeys.Vehicle_Angledrive).GetEx<double>(JsonKeys.Vehicle_Angledrive_Efficiency); }
}
#endregion
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/AbstractSimulationDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/AbstractSimulationDataAdapter.cs
index adb2f1401bf8f88750eb5dc4c91842ea8260a164..46065fe6837898415cb2c64c1e145161331d1f40 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/AbstractSimulationDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/AbstractSimulationDataAdapter.cs
@@ -141,14 +141,15 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
{
TransmissionLossMap axleLossMap;
if (data.LossMap == null && useEfficiencyFallback) {
- axleLossMap = TransmissionLossMapReader.Create(data.Efficiency, data.Ratio, "AxleGear");
+ axleLossMap = TransmissionLossMapReader.Create(data.Efficiency, data.Ratio, "Axlegear");
} else {
- if (data.LossMap == null)
- throw new Exception("LossMap for AxleGear is missing.");
- axleLossMap = TransmissionLossMapReader.Create(data.LossMap, data.Ratio, "AxleGear");
+ if (data.LossMap == null) {
+ throw new InvalidFileFormatException("LossMap for Axlegear is missing.");
+ }
+ axleLossMap = TransmissionLossMapReader.Create(data.LossMap, data.Ratio, "Axlegear");
}
if (axleLossMap == null) {
- throw new Exception("LossMap for AxleGear is missing.");
+ throw new InvalidFileFormatException("LossMap for Axlegear is missing.");
}
return new AxleGearData {
@@ -165,22 +166,22 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
}
/// <summary>
- /// Creates an AngularGearData or returns null if there is no angular gear.
+ /// Creates an AngledriveData or returns null if there is no angular gear.
/// </summary>
/// <param name="data"></param>
/// <param name="useEfficiencyFallback">if true, the Efficiency value is used if no LossMap is found.</param>
/// <returns></returns>
- internal AngularGearData CreateAngularGearData(IAngularGearInputData data, bool useEfficiencyFallback)
+ internal AngledriveData CreateAngledriveData(IAngledriveInputData data, bool useEfficiencyFallback)
{
try {
var type = data.Type;
switch (type) {
- case AngularGearType.LossesIncludedInGearbox:
- case AngularGearType.None:
+ case AngledriveType.LossesIncludedInGearbox:
+ case AngledriveType.None:
return null;
- case AngularGearType.SeparateAngularGear:
- var angularGear = new AngularGearData {
+ case AngledriveType.SeparateAngledrive:
+ var angledriveData = new AngledriveData {
SavedInDeclarationMode = data.SavedInDeclarationMode,
Vendor = data.Vendor,
ModelName = data.ModelName,
@@ -190,25 +191,27 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
DigestValue = data.DigestValue,
IntegrityStatus = data.IntegrityStatus,
Type = type,
- AngularGear = new TransmissionData { Ratio = data.Ratio }
+ Angledrive = new TransmissionData { Ratio = data.IAngledriveInputData_Ratio }
};
try {
- angularGear.AngularGear.LossMap = TransmissionLossMapReader.Create(data.LossMap, data.Ratio, "AngularGear");
+ angledriveData.Angledrive.LossMap = TransmissionLossMapReader.Create(data.IAngledriveInputData_LossMap,
+ data.IAngledriveInputData_Ratio, "Angledrive");
} catch (VectoException ex) {
- Log.Info("AngularGear Loss Map not found.");
+ Log.Info("Angledrive Loss Map not found.");
if (useEfficiencyFallback) {
- Log.Info("AngularGear Trying with Efficiency instead of Loss Map.");
- angularGear.AngularGear.LossMap = TransmissionLossMapReader.Create(data.Efficiency, data.Ratio, "AngularGear");
+ Log.Info("Angledrive Trying with Efficiency instead of Loss Map.");
+ angledriveData.Angledrive.LossMap = TransmissionLossMapReader.Create(data.Efficiency,
+ data.IAngledriveInputData_Ratio, "Angledrive");
} else {
- throw new VectoException("AngularGear: LossMap not found.", ex);
+ throw new VectoException("Angledrive: LossMap not found.", ex);
}
}
- return angularGear;
+ return angledriveData;
default:
- throw new ArgumentOutOfRangeException("data", "Unknown Angulargear Type.");
+ throw new ArgumentOutOfRangeException("data", "Unknown Angledrive Type.");
}
} catch (Exception e) {
- throw new VectoException("Error while reading AngularGear data: {0}", e.Message);
+ throw new VectoException("Error while reading Angledrive data: {0}", e.Message);
}
}
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
index 475f40b4b69fc0ad8d4790d9a1db8e9eb482bbef..feaf5c113c3339164fccce36a56af61452e11686 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
@@ -73,7 +73,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
segment.Missions.First().Loadings.First().Value);
var engineData = dao.CreateEngineData(InputDataProvider.EngineInputData, InputDataProvider.GearboxInputData.Type);
var axlegearData = dao.CreateAxleGearData(InputDataProvider.AxleGearInputData, false);
- var angularGearData = dao.CreateAngularGearData(InputDataProvider.AngularGearInputData, false);
+ var angledriveData = dao.CreateAngledriveData(InputDataProvider.AngledriveInputData, false);
var gearboxData = dao.CreateGearboxData(InputDataProvider.GearboxInputData, engineData, axlegearData.AxleGear.Ratio,
tempVehicle.DynamicTyreRadius, false);
var retarderData = dao.CreateRetarderData(InputDataProvider.RetarderInputData);
@@ -109,7 +109,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
EngineData = engineData.Copy(),
GearboxData = gearboxData,
AxleGearData = axlegearData,
- AngularGearData = angularGearData,
+ AngledriveData = angledriveData,
Aux = dao.CreateAuxiliaryData(InputDataProvider.AuxiliaryInputData(), mission.MissionType,
segment.VehicleClass),
Cycle = cycle,
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
index d83f066d71cde95be6910d9cce1ca67bfc1f07c9..3ccb559a706c91d5f4eab6c45712135d11fedca7 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
@@ -70,7 +70,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
var gearboxData = dao.CreateGearboxData(InputDataProvider.GearboxInputData, engineData, axlegearData.AxleGear.Ratio,
tempVehicle.DynamicTyreRadius, useEfficiencyFallback: true);
var crossWindRequired = vehicleInputData.CrossWindCorrectionMode == CrossWindCorrectionMode.VAirBetaLookupTable;
- var angularGearData = dao.CreateAngularGearData(InputDataProvider.AngularGearInputData, useEfficiencyFallback: true);
+ var angledriveData = dao.CreateAngledriveData(InputDataProvider.AngledriveInputData, useEfficiencyFallback: true);
var ptoTransmissionData = dao.CreatePTOTransmissionData(InputDataProvider.PTOTransmissionInputData);
return InputDataProvider.JobInputData().Cycles.Select(cycle => new VectoRunData {
@@ -78,7 +78,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
EngineData = engineData,
GearboxData = gearboxData,
AxleGearData = axlegearData,
- AngularGearData = angularGearData,
+ AngledriveData = angledriveData,
VehicleData = dao.CreateVehicleData(vehicleInputData),
DriverData = driver,
Aux = dao.CreateAuxiliaryData(InputDataProvider.AuxiliaryInputData()),
diff --git a/VectoCore/VectoCore/JsonKeys.Designer.cs b/VectoCore/VectoCore/JsonKeys.Designer.cs
index f2337736ac4f710ce55a145bb28a9430a3dc2e40..38a6b43159a935513d7b8faa1386eaa1df44e21a 100644
--- a/VectoCore/VectoCore/JsonKeys.Designer.cs
+++ b/VectoCore/VectoCore/JsonKeys.Designer.cs
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
// <auto-generated>
-// This code was generated by a tool.
-// Runtime Version:4.0.30319.42000
+// Dieser Code wurde von einem Tool generiert.
+// Laufzeitversion:4.0.30319.42000
//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
+// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+// der Code erneut generiert wird.
// </auto-generated>
//------------------------------------------------------------------------------
@@ -13,12 +13,12 @@ namespace TUGraz.VectoCore {
/// <summary>
- /// A strongly-typed resource class, for looking up localized strings, etc.
+ /// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
/// </summary>
- // This class was auto-generated by the StronglyTypedResourceBuilder
- // class via a tool like ResGen or Visual Studio.
- // To add or remove a member, edit your .ResX file then rerun ResGen
- // with the /str option, or rebuild your VS project.
+ // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+ // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+ // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+ // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
@@ -33,7 +33,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Returns the cached ResourceManager instance used by this class.
+ /// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager {
@@ -47,8 +47,8 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Overrides the current thread's CurrentUICulture property for all
- /// resource lookups using this strongly typed resource class.
+ /// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+ /// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
@@ -61,7 +61,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to VACC.
+ /// Sucht eine lokalisierte Zeichenfolge, die VACC ähnelt.
/// </summary>
internal static string DriverData_AccelerationCurve {
get {
@@ -70,7 +70,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to Dec.
+ /// Sucht eine lokalisierte Zeichenfolge, die Dec ähnelt.
/// </summary>
internal static string DriverData_Lookahead_Deceleration {
get {
@@ -79,7 +79,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to Enabled.
+ /// Sucht eine lokalisierte Zeichenfolge, die Enabled ähnelt.
/// </summary>
internal static string DriverData_Lookahead_Enabled {
get {
@@ -88,7 +88,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to MinSpeed.
+ /// Sucht eine lokalisierte Zeichenfolge, die MinSpeed ähnelt.
/// </summary>
internal static string DriverData_Lookahead_MinSpeed {
get {
@@ -97,7 +97,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to LAC.
+ /// Sucht eine lokalisierte Zeichenfolge, die LAC ähnelt.
/// </summary>
internal static string DriverData_LookaheadCoasting {
get {
@@ -106,7 +106,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to OverSpeedEcoRoll.
+ /// Sucht eine lokalisierte Zeichenfolge, die OverSpeedEcoRoll ähnelt.
/// </summary>
internal static string DriverData_OverspeedEcoRoll {
get {
@@ -115,7 +115,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to MinSpeed.
+ /// Sucht eine lokalisierte Zeichenfolge, die MinSpeed ähnelt.
/// </summary>
internal static string DriverData_OverspeedEcoRoll_MinSpeed {
get {
@@ -124,7 +124,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to Mode.
+ /// Sucht eine lokalisierte Zeichenfolge, die Mode ähnelt.
/// </summary>
internal static string DriverData_OverspeedEcoRoll_Mode {
get {
@@ -133,7 +133,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to OverSpeed.
+ /// Sucht eine lokalisierte Zeichenfolge, die OverSpeed ähnelt.
/// </summary>
internal static string DriverData_OverspeedEcoRoll_OverSpeed {
get {
@@ -142,7 +142,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to UnderSpeed.
+ /// Sucht eine lokalisierte Zeichenfolge, die UnderSpeed ähnelt.
/// </summary>
internal static string DriverData_OverspeedEcoRoll_UnderSpeed {
get {
@@ -151,7 +151,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to StartStop.
+ /// Sucht eine lokalisierte Zeichenfolge, die StartStop ähnelt.
/// </summary>
internal static string DriverData_StartStop {
get {
@@ -160,7 +160,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to Delay.
+ /// Sucht eine lokalisierte Zeichenfolge, die Delay ähnelt.
/// </summary>
internal static string DriverData_StartStop_Delay {
get {
@@ -169,7 +169,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to Enabled.
+ /// Sucht eine lokalisierte Zeichenfolge, die Enabled ähnelt.
/// </summary>
internal static string DriverData_StartStop_Enabled {
get {
@@ -178,7 +178,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to MaxSpeed.
+ /// Sucht eine lokalisierte Zeichenfolge, die MaxSpeed ähnelt.
/// </summary>
internal static string DriverData_StartStop_MaxSpeed {
get {
@@ -187,7 +187,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to MinTime.
+ /// Sucht eine lokalisierte Zeichenfolge, die MinTime ähnelt.
/// </summary>
internal static string DriverData_StartStop_MinTime {
get {
@@ -196,7 +196,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to Displacement.
+ /// Sucht eine lokalisierte Zeichenfolge, die Displacement ähnelt.
/// </summary>
internal static string Engine_Displacement {
get {
@@ -205,7 +205,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to FuelMap.
+ /// Sucht eine lokalisierte Zeichenfolge, die FuelMap ähnelt.
/// </summary>
internal static string Engine_FuelConsumptionMap {
get {
@@ -214,7 +214,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to FullLoadCurve.
+ /// Sucht eine lokalisierte Zeichenfolge, die FullLoadCurve ähnelt.
/// </summary>
internal static string Engine_FullLoadCurveFile {
get {
@@ -223,7 +223,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to IdlingSpeed.
+ /// Sucht eine lokalisierte Zeichenfolge, die IdlingSpeed ähnelt.
/// </summary>
internal static string Engine_IdleSpeed {
get {
@@ -232,7 +232,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to Inertia.
+ /// Sucht eine lokalisierte Zeichenfolge, die Inertia ähnelt.
/// </summary>
internal static string Engine_Inertia {
get {
@@ -241,7 +241,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to ModelName.
+ /// Sucht eine lokalisierte Zeichenfolge, die ModelName ähnelt.
/// </summary>
internal static string Engine_ModelName {
get {
@@ -250,7 +250,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to WHTC-Motorway.
+ /// Sucht eine lokalisierte Zeichenfolge, die WHTC-Motorway ähnelt.
/// </summary>
internal static string Engine_WHTC_Motorway {
get {
@@ -259,7 +259,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to WHTC-Rural.
+ /// Sucht eine lokalisierte Zeichenfolge, die WHTC-Rural ähnelt.
/// </summary>
internal static string Engine_WHTC_Rural {
get {
@@ -268,7 +268,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to WHTC-Urban.
+ /// Sucht eine lokalisierte Zeichenfolge, die WHTC-Urban ähnelt.
/// </summary>
internal static string Engine_WHTC_Urban {
get {
@@ -277,7 +277,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to EaryShiftUp.
+ /// Sucht eine lokalisierte Zeichenfolge, die EaryShiftUp ähnelt.
/// </summary>
internal static string Gearbox_EarlyShiftUp {
get {
@@ -286,7 +286,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to Efficiency.
+ /// Sucht eine lokalisierte Zeichenfolge, die Efficiency ähnelt.
/// </summary>
internal static string Gearbox_Gear_Efficiency {
get {
@@ -295,7 +295,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to FullLoadCurve.
+ /// Sucht eine lokalisierte Zeichenfolge, die FullLoadCurve ähnelt.
/// </summary>
internal static string Gearbox_Gear_FullLoadCurveFile {
get {
@@ -304,7 +304,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to LossMap.
+ /// Sucht eine lokalisierte Zeichenfolge, die LossMap ähnelt.
/// </summary>
internal static string Gearbox_Gear_LossMapFile {
get {
@@ -313,7 +313,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to Ratio.
+ /// Sucht eine lokalisierte Zeichenfolge, die Ratio ähnelt.
/// </summary>
internal static string Gearbox_Gear_Ratio {
get {
@@ -322,7 +322,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to ShiftPolygon.
+ /// Sucht eine lokalisierte Zeichenfolge, die ShiftPolygon ähnelt.
/// </summary>
internal static string Gearbox_Gear_ShiftPolygonFile {
get {
@@ -331,7 +331,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to TCactive.
+ /// Sucht eine lokalisierte Zeichenfolge, die TCactive ähnelt.
/// </summary>
internal static string Gearbox_Gear_TCactive {
get {
@@ -340,7 +340,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to GearboxType.
+ /// Sucht eine lokalisierte Zeichenfolge, die GearboxType ähnelt.
/// </summary>
internal static string Gearbox_GearboxType {
get {
@@ -349,7 +349,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to Gears.
+ /// Sucht eine lokalisierte Zeichenfolge, die Gears ähnelt.
/// </summary>
internal static string Gearbox_Gears {
get {
@@ -358,7 +358,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to Inertia.
+ /// Sucht eine lokalisierte Zeichenfolge, die Inertia ähnelt.
/// </summary>
internal static string Gearbox_Inertia {
get {
@@ -367,7 +367,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to ModelName.
+ /// Sucht eine lokalisierte Zeichenfolge, die ModelName ähnelt.
/// </summary>
internal static string Gearbox_ModelName {
get {
@@ -376,7 +376,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to ShiftTime.
+ /// Sucht eine lokalisierte Zeichenfolge, die ShiftTime ähnelt.
/// </summary>
internal static string Gearbox_ShiftTime {
get {
@@ -385,7 +385,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to SkipGears.
+ /// Sucht eine lokalisierte Zeichenfolge, die SkipGears ähnelt.
/// </summary>
internal static string Gearbox_SkipGears {
get {
@@ -394,7 +394,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to StartAcc.
+ /// Sucht eine lokalisierte Zeichenfolge, die StartAcc ähnelt.
/// </summary>
internal static string Gearbox_StartAcceleration {
get {
@@ -403,7 +403,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to StartSpeed.
+ /// Sucht eine lokalisierte Zeichenfolge, die StartSpeed ähnelt.
/// </summary>
internal static string Gearbox_StartSpeed {
get {
@@ -412,7 +412,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to StartTqReserve.
+ /// Sucht eine lokalisierte Zeichenfolge, die StartTqReserve ähnelt.
/// </summary>
internal static string Gearbox_StartTorqueReserve {
get {
@@ -421,7 +421,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to TorqueConverter.
+ /// Sucht eine lokalisierte Zeichenfolge, die TorqueConverter ähnelt.
/// </summary>
internal static string Gearbox_TorqueConverter {
get {
@@ -430,7 +430,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to Inertia.
+ /// Sucht eine lokalisierte Zeichenfolge, die Inertia ähnelt.
/// </summary>
internal static string Gearbox_TorqueConverter_Inertia {
get {
@@ -439,7 +439,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to RefRPM.
+ /// Sucht eine lokalisierte Zeichenfolge, die RefRPM ähnelt.
/// </summary>
internal static string Gearbox_TorqueConverter_ReferenceRPM {
get {
@@ -448,7 +448,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to File.
+ /// Sucht eine lokalisierte Zeichenfolge, die File ähnelt.
/// </summary>
internal static string Gearbox_TorqueConverter_TCMap {
get {
@@ -457,7 +457,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to TqReserve.
+ /// Sucht eine lokalisierte Zeichenfolge, die TqReserve ähnelt.
/// </summary>
internal static string Gearbox_TorqueReserve {
get {
@@ -466,7 +466,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to TracInt.
+ /// Sucht eine lokalisierte Zeichenfolge, die TracInt ähnelt.
/// </summary>
internal static string Gearbox_TractionInterruption {
get {
@@ -475,7 +475,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to Cycles.
+ /// Sucht eine lokalisierte Zeichenfolge, die Cycles ähnelt.
/// </summary>
internal static string Job_Cycles {
get {
@@ -484,7 +484,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to EngineOnlyMode.
+ /// Sucht eine lokalisierte Zeichenfolge, die EngineOnlyMode ähnelt.
/// </summary>
internal static string Job_EngineOnlyMode {
get {
@@ -493,7 +493,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to Body.
+ /// Sucht eine lokalisierte Zeichenfolge, die Body ähnelt.
/// </summary>
internal static string JsonBody {
get {
@@ -502,7 +502,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to Header.
+ /// Sucht eine lokalisierte Zeichenfolge, die Header ähnelt.
/// </summary>
internal static string JsonHeader {
get {
@@ -511,7 +511,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to FileVersion.
+ /// Sucht eine lokalisierte Zeichenfolge, die FileVersion ähnelt.
/// </summary>
internal static string JsonHeader_FileVersion {
get {
@@ -520,7 +520,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to SavedInDeclMode.
+ /// Sucht eine lokalisierte Zeichenfolge, die SavedInDeclMode ähnelt.
/// </summary>
internal static string SavedInDeclMode {
get {
@@ -529,52 +529,52 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to AngularGear.
+ /// Sucht eine lokalisierte Zeichenfolge, die Angledrive ähnelt.
/// </summary>
- internal static string Vehicle_AngularGear {
+ internal static string Vehicle_Angledrive {
get {
- return ResourceManager.GetString("Vehicle_AngularGear", resourceCulture);
+ return ResourceManager.GetString("Vehicle_Angledrive", resourceCulture);
}
}
/// <summary>
- /// Looks up a localized string similar to Efficiency.
+ /// Sucht eine lokalisierte Zeichenfolge, die Efficiency ähnelt.
/// </summary>
- internal static string Vehicle_AngularGear_Efficiency {
+ internal static string Vehicle_Angledrive_Efficiency {
get {
- return ResourceManager.GetString("Vehicle_AngularGear_Efficiency", resourceCulture);
+ return ResourceManager.GetString("Vehicle_Angledrive_Efficiency", resourceCulture);
}
}
/// <summary>
- /// Looks up a localized string similar to LossMap.
+ /// Sucht eine lokalisierte Zeichenfolge, die LossMap ähnelt.
/// </summary>
- internal static string Vehicle_AngularGear_LossMapFile {
+ internal static string Vehicle_Angledrive_LossMapFile {
get {
- return ResourceManager.GetString("Vehicle_AngularGear_LossMapFile", resourceCulture);
+ return ResourceManager.GetString("Vehicle_Angledrive_LossMapFile", resourceCulture);
}
}
/// <summary>
- /// Looks up a localized string similar to Ratio.
+ /// Sucht eine lokalisierte Zeichenfolge, die Ratio ähnelt.
/// </summary>
- internal static string Vehicle_AngularGear_Ratio {
+ internal static string Vehicle_Angledrive_Ratio {
get {
- return ResourceManager.GetString("Vehicle_AngularGear_Ratio", resourceCulture);
+ return ResourceManager.GetString("Vehicle_Angledrive_Ratio", resourceCulture);
}
}
/// <summary>
- /// Looks up a localized string similar to Type.
+ /// Sucht eine lokalisierte Zeichenfolge, die Type ähnelt.
/// </summary>
- internal static string Vehicle_AngularGear_Type {
+ internal static string Vehicle_Angledrive_Type {
get {
- return ResourceManager.GetString("Vehicle_AngularGear_Type", resourceCulture);
+ return ResourceManager.GetString("Vehicle_Angledrive_Type", resourceCulture);
}
}
/// <summary>
- /// Looks up a localized string similar to AxleConfig.
+ /// Sucht eine lokalisierte Zeichenfolge, die AxleConfig ähnelt.
/// </summary>
internal static string Vehicle_AxleConfiguration {
get {
@@ -583,7 +583,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to Axles.
+ /// Sucht eine lokalisierte Zeichenfolge, die Axles ähnelt.
/// </summary>
internal static string Vehicle_AxleConfiguration_Axles {
get {
@@ -592,7 +592,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to Type.
+ /// Sucht eine lokalisierte Zeichenfolge, die Type ähnelt.
/// </summary>
internal static string Vehicle_AxleConfiguration_Type {
get {
@@ -601,7 +601,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to Inertia.
+ /// Sucht eine lokalisierte Zeichenfolge, die Inertia ähnelt.
/// </summary>
internal static string Vehicle_Axles_Inertia {
get {
@@ -610,7 +610,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to RRCISO.
+ /// Sucht eine lokalisierte Zeichenfolge, die RRCISO ähnelt.
/// </summary>
internal static string Vehicle_Axles_RollResistanceCoefficient {
get {
@@ -619,7 +619,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to TwinTyres.
+ /// Sucht eine lokalisierte Zeichenfolge, die TwinTyres ähnelt.
/// </summary>
internal static string Vehicle_Axles_TwinTyres {
get {
@@ -628,7 +628,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to FzISO.
+ /// Sucht eine lokalisierte Zeichenfolge, die FzISO ähnelt.
/// </summary>
internal static string Vehicle_Axles_TyreTestLoad {
get {
@@ -637,7 +637,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to Wheels.
+ /// Sucht eine lokalisierte Zeichenfolge, die Wheels ähnelt.
/// </summary>
internal static string Vehicle_Axles_Wheels {
get {
@@ -646,7 +646,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to CurbWeight.
+ /// Sucht eine lokalisierte Zeichenfolge, die CurbWeight ähnelt.
/// </summary>
internal static string Vehicle_CurbWeight {
get {
@@ -655,7 +655,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to CurbWeightExtra.
+ /// Sucht eine lokalisierte Zeichenfolge, die CurbWeightExtra ähnelt.
/// </summary>
internal static string Vehicle_CurbWeightExtra {
get {
@@ -664,7 +664,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to CdA.
+ /// Sucht eine lokalisierte Zeichenfolge, die CdA ähnelt.
/// </summary>
internal static string Vehicle_DragCoefficient {
get {
@@ -673,7 +673,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to CdA2.
+ /// Sucht eine lokalisierte Zeichenfolge, die CdA2 ähnelt.
/// </summary>
internal static string Vehicle_DragCoefficientRigidTruck {
get {
@@ -682,7 +682,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to rdyn.
+ /// Sucht eine lokalisierte Zeichenfolge, die rdyn ähnelt.
/// </summary>
internal static string Vehicle_DynamicTyreRadius {
get {
@@ -691,7 +691,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to EngineFile.
+ /// Sucht eine lokalisierte Zeichenfolge, die EngineFile ähnelt.
/// </summary>
internal static string Vehicle_EngineFile {
get {
@@ -700,7 +700,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to GearboxFile.
+ /// Sucht eine lokalisierte Zeichenfolge, die GearboxFile ähnelt.
/// </summary>
internal static string Vehicle_GearboxFile {
get {
@@ -709,7 +709,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to MassMax.
+ /// Sucht eine lokalisierte Zeichenfolge, die MassMax ähnelt.
/// </summary>
internal static string Vehicle_GrossVehicleMassRating {
get {
@@ -718,7 +718,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to Loading.
+ /// Sucht eine lokalisierte Zeichenfolge, die Loading ähnelt.
/// </summary>
internal static string Vehicle_Loading {
get {
@@ -727,7 +727,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to PTO.
+ /// Sucht eine lokalisierte Zeichenfolge, die PTO ähnelt.
/// </summary>
internal static string Vehicle_PTO {
get {
@@ -736,7 +736,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to Cycle.
+ /// Sucht eine lokalisierte Zeichenfolge, die Cycle ähnelt.
/// </summary>
internal static string Vehicle_PTO_Cycle {
get {
@@ -745,7 +745,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to LossMap.
+ /// Sucht eine lokalisierte Zeichenfolge, die LossMap ähnelt.
/// </summary>
internal static string Vehicle_PTO_LossMapFile {
get {
@@ -754,7 +754,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to Type.
+ /// Sucht eine lokalisierte Zeichenfolge, die Type ähnelt.
/// </summary>
internal static string Vehicle_PTO_Type {
get {
@@ -763,7 +763,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to Retarder.
+ /// Sucht eine lokalisierte Zeichenfolge, die Retarder ähnelt.
/// </summary>
internal static string Vehicle_Retarder {
get {
@@ -772,7 +772,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to File.
+ /// Sucht eine lokalisierte Zeichenfolge, die File ähnelt.
/// </summary>
internal static string Vehicle_Retarder_LossMapFile {
get {
@@ -781,7 +781,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to Ratio.
+ /// Sucht eine lokalisierte Zeichenfolge, die Ratio ähnelt.
/// </summary>
internal static string Vehicle_Retarder_Ratio {
get {
@@ -790,7 +790,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to Type.
+ /// Sucht eine lokalisierte Zeichenfolge, die Type ähnelt.
/// </summary>
internal static string Vehicle_Retarder_Type {
get {
@@ -799,7 +799,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to Rim.
+ /// Sucht eine lokalisierte Zeichenfolge, die Rim ähnelt.
/// </summary>
internal static string Vehicle_Rim {
get {
@@ -808,7 +808,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to VehCat.
+ /// Sucht eine lokalisierte Zeichenfolge, die VehCat ähnelt.
/// </summary>
internal static string Vehicle_VehicleCategory {
get {
@@ -817,7 +817,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to VehicleFile.
+ /// Sucht eine lokalisierte Zeichenfolge, die VehicleFile ähnelt.
/// </summary>
internal static string Vehicle_VehicleFile {
get {
diff --git a/VectoCore/VectoCore/JsonKeys.resx b/VectoCore/VectoCore/JsonKeys.resx
index b19f7fe807f6eeb3d03f3bee247f327374c8146a..ea9a5b22bf7b265bdbd778d71da28dc36b620e78 100644
--- a/VectoCore/VectoCore/JsonKeys.resx
+++ b/VectoCore/VectoCore/JsonKeys.resx
@@ -185,19 +185,19 @@
<data name="Vehicle_PTO_Type" xml:space="preserve">
<value>Type</value>
</data>
- <data name="Vehicle_AngularGear" xml:space="preserve">
- <value>AngularGear</value>
+ <data name="Vehicle_Angledrive" xml:space="preserve">
+ <value>Angledrive</value>
</data>
- <data name="Vehicle_AngularGear_Type" xml:space="preserve">
+ <data name="Vehicle_Angledrive_Type" xml:space="preserve">
<value>Type</value>
</data>
- <data name="Vehicle_AngularGear_Ratio" xml:space="preserve">
+ <data name="Vehicle_Angledrive_Ratio" xml:space="preserve">
<value>Ratio</value>
</data>
- <data name="Vehicle_AngularGear_LossMapFile" xml:space="preserve">
+ <data name="Vehicle_Angledrive_LossMapFile" xml:space="preserve">
<value>LossMap</value>
</data>
- <data name="Vehicle_AngularGear_Efficiency" xml:space="preserve">
+ <data name="Vehicle_Angledrive_Efficiency" xml:space="preserve">
<value>Efficiency</value>
</data>
<data name="Engine_ModelName" xml:space="preserve">
diff --git a/VectoCore/VectoCore/Models/Connector/Ports/Impl/Response.cs b/VectoCore/VectoCore/Models/Connector/Ports/Impl/Response.cs
index 323fb37a05af41bd615957e4e33164a151f6b0ae..91f78a7cbd89fcba766af77d05d3656f20f93cd4 100644
--- a/VectoCore/VectoCore/Models/Connector/Ports/Impl/Response.cs
+++ b/VectoCore/VectoCore/Models/Connector/Ports/Impl/Response.cs
@@ -51,7 +51,7 @@ namespace TUGraz.VectoCore.Models.Connector.Ports.Impl
public Watt DynamicFullLoadPower { get; set; }
public Watt DragPower { get; set; }
- public Watt AngularGearPowerRequest { get; set; }
+ public Watt AngledrivePowerRequest { get; set; }
public Watt ClutchPowerRequest { get; set; }
public Watt GearboxPowerRequest { get; set; }
public Watt AxlegearPowerRequest { get; set; }
diff --git a/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs b/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs
index 02e8c0b1d68ce6df05d53c16708c1eaec25dfe72..8974c7d38e19d47383b58e9b4338bbe6b06181b5 100644
--- a/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs
@@ -58,7 +58,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Data
public AxleGearData AxleGearData { get; internal set; }
[ValidateObject]
- public AngularGearData AngularGearData { get; internal set; }
+ public AngledriveData AngledriveData { get; internal set; }
[Required, ValidateObject]
public DrivingCycleData Cycle { get; internal set; }
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
index 7bfcdb22b2c3a4119825f322892530b95a15baaa..e4bd04ff55049946e558643966dc23c74f5128c7 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
@@ -110,7 +110,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
var powertrain = new PWheelCycle(container, data.Cycle, data.AxleGearData.AxleGear.Ratio,
gearbox.ModelData.Gears.ToDictionary(g => g.Key, g => g.Value.Ratio))
.AddComponent(new AxleGear(container, data.AxleGearData))
- .AddComponent(data.AngularGearData != null ? new AngularGear(container, data.AngularGearData) : null)
+ .AddComponent(data.AngledriveData != null ? new Angledrive(container, data.AngledriveData) : null)
.AddComponent(gearbox, data.Retarder, data.PTO, container)
.AddComponent(new Clutch(container, data.EngineData));
var engine = new CombustionEngine(container, data.EngineData, pt1Disabled: true);
@@ -138,7 +138,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
.AddComponent(new Wheels(container, data.VehicleData.DynamicTyreRadius, data.VehicleData.WheelsInertia))
.AddComponent(new Brakes(container))
.AddComponent(new AxleGear(container, data.AxleGearData))
- .AddComponent(data.AngularGearData != null ? new AngularGear(container, data.AngularGearData) : null)
+ .AddComponent(data.AngledriveData != null ? new Angledrive(container, data.AngledriveData) : null)
.AddComponent(GetGearbox(container, data.GearboxData, data.EngineData.Inertia), data.Retarder, data.PTO, container);
if (data.GearboxData.Type.ManualTransmission()) {
powertrain = powertrain.AddComponent(new Clutch(container, data.EngineData));
@@ -169,7 +169,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
.AddComponent(new Wheels(container, data.VehicleData.DynamicTyreRadius, data.VehicleData.WheelsInertia))
.AddComponent(new Brakes(container))
.AddComponent(new AxleGear(container, data.AxleGearData))
- .AddComponent(data.AngularGearData != null ? new AngularGear(container, data.AngularGearData) : null)
+ .AddComponent(data.AngledriveData != null ? new Angledrive(container, data.AngledriveData) : null)
.AddComponent(GetGearbox(container, data.GearboxData, data.EngineData.Inertia), data.Retarder, data.PTO, container);
if (data.GearboxData.Type.ManualTransmission()) {
powertrain = powertrain.AddComponent(new Clutch(container, data.EngineData));
@@ -196,7 +196,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
.AddComponent(new Wheels(container, data.VehicleData.DynamicTyreRadius, data.VehicleData.WheelsInertia))
.AddComponent(new Brakes(container))
.AddComponent(new AxleGear(container, data.AxleGearData))
- .AddComponent(data.AngularGearData != null ? new AngularGear(container, data.AngularGearData) : null)
+ .AddComponent(data.AngledriveData != null ? new Angledrive(container, data.AngledriveData) : null)
.AddComponent(GetGearbox(container, data.GearboxData, data.EngineData.Inertia), data.Retarder, data.PTO, container);
if (data.GearboxData.Type.ManualTransmission()) {
powertrain = powertrain.AddComponent(new Clutch(container, data.EngineData));
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/AccelerationCurve.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/AccelerationCurve.cs
index ad52bffd2940dc50b46252ddd1edfd6397fdd9bb..35a68b857d43b58fc169edb8e58f22740f973b2a 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/AccelerationCurve.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/AccelerationCurve.cs
@@ -31,6 +31,7 @@
using System;
using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
using System.Diagnostics;
using System.Linq;
using TUGraz.VectoCommon.Utils;
@@ -100,7 +101,10 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
[DebuggerDisplay("Acceleration: {Acceleration}, Deceleration: {Deceleration}")]
public class AccelerationEntry
{
+ [Required, SIRange(0.3, 10)]
public MeterPerSquareSecond Acceleration { get; set; }
+
+ [Required, SIRange(-0.5, -10)]
public MeterPerSquareSecond Deceleration { get; set; }
}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/AngularGearData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/AngledriveData.cs
similarity index 91%
rename from VectoCore/VectoCore/Models/SimulationComponent/Data/AngularGearData.cs
rename to VectoCore/VectoCore/Models/SimulationComponent/Data/AngledriveData.cs
index 6fceab9d3c4d0cc884fe3d407ac7667beb142def..d76b49a192a17eb38b64bcd20fb317e66d9a7fa5 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/AngularGearData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/AngledriveData.cs
@@ -35,10 +35,10 @@ using TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox;
namespace TUGraz.VectoCore.Models.SimulationComponent.Data
{
- public class AngularGearData : SimulationComponentData
+ public class AngledriveData : SimulationComponentData
{
- [ValidateObject] public TransmissionData AngularGear;
+ [ValidateObject] public TransmissionData Angledrive;
- public AngularGearType Type;
+ public AngledriveType Type;
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs
index 8d484b39a51d16d93be0be34fd71fcc74330a512..9f2c83b285f95fda4cb9e55b14cd71896493d85f 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs
@@ -205,12 +205,12 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
}
// vvvvvvv these checks apply only for declaration mode! vvvvvv
- if (vehicleData.AxleConfiguration.NumAxles() != vehicleData.AxleData.Count) {
- return
- new ValidationResult(
- string.Format("For a {0} type vehicle exactly {1} number of axles have to pe specified. Found {2}",
- vehicleData.AxleConfiguration.GetName(), vehicleData.AxleConfiguration.NumAxles(), vehicleData.AxleData.Count));
- }
+ //if (vehicleData.AxleConfiguration.NumAxles() != vehicleData.AxleData.Count) {
+ // return
+ // new ValidationResult(
+ // string.Format("For a {0} type vehicle exactly {1} number of axles have to pe specified. Found {2}",
+ // vehicleData.AxleConfiguration.GetName(), vehicleData.AxleConfiguration.NumAxles(), vehicleData.AxleData.Count));
+ //}
if (vehicleData.TotalVehicleWeight() > gvwTotal) {
return new ValidationResult(
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/AngularGear.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Angledrive.cs
similarity index 89%
rename from VectoCore/VectoCore/Models/SimulationComponent/Impl/AngularGear.cs
rename to VectoCore/VectoCore/Models/SimulationComponent/Impl/Angledrive.cs
index e43c65d55ba01d86a20ad5d0482e29c2373a07cf..880810ab53e625901ada552047209a003cce8bce 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/AngularGear.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Angledrive.cs
@@ -38,15 +38,15 @@ using TUGraz.VectoCore.OutputData;
namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
{
- public class AngularGear : TransmissionComponent
+ public class Angledrive : TransmissionComponent
{
- public AngularGear(IVehicleContainer container, AngularGearData modelData) : base(container, modelData.AngularGear) {}
+ public Angledrive(IVehicleContainer container, AngledriveData modelData) : base(container, modelData.Angledrive) {}
public override IResponse Request(Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity,
bool dryRun = false)
{
var retVal = base.Request(absTime, dt, outTorque, outAngularVelocity, dryRun);
- retVal.AngularGearPowerRequest = outTorque * (PreviousState.OutAngularVelocity + CurrentState.OutAngularVelocity) / 2.0;
+ retVal.AngledrivePowerRequest = outTorque * (PreviousState.OutAngularVelocity + CurrentState.OutAngularVelocity) / 2.0;
return retVal;
}
diff --git a/VectoCore/VectoCore/OutputData/IModalDataContainer.cs b/VectoCore/VectoCore/OutputData/IModalDataContainer.cs
index 0ff2b1891a239133175e7e09e2e4fc8c00bc6a7b..19b0a9f5eb889c38e5e3c2f01fbe8d9be1d23e7c 100644
--- a/VectoCore/VectoCore/OutputData/IModalDataContainer.cs
+++ b/VectoCore/VectoCore/OutputData/IModalDataContainer.cs
@@ -235,7 +235,7 @@ namespace TUGraz.VectoCore.OutputData
return data.TimeIntegral<WattSecond>(ModalResultField.P_ret_loss);
}
- public static WattSecond WorkAngularGear(this IModalDataContainer data)
+ public static WattSecond WorkAngledrive(this IModalDataContainer data)
{
return data.TimeIntegral<WattSecond>(ModalResultField.P_angle_loss);
}
diff --git a/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs b/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
index 05a700519e6d4a3347570f5f82b6c1af3f8e8cd3..a16852c3233a1f001b69022b27cbaca24ec457d2 100644
--- a/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
+++ b/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
@@ -253,7 +253,7 @@ namespace TUGraz.VectoCore.OutputData
row[E_GBX_AXL_LOSS] = modData.WorkTransmission().ConvertTo().Kilo.Watt.Hour;
row[E_RET_LOSS] = modData.WorkRetarder().ConvertTo().Kilo.Watt.Hour;
row[E_TC_LOSS] = modData.WorkTorqueConverter().ConvertTo().Kilo.Watt.Hour;
- row[E_ANGLE_LOSS] = modData.WorkAngularGear().ConvertTo().Kilo.Watt.Hour;
+ row[E_ANGLE_LOSS] = modData.WorkAngledrive().ConvertTo().Kilo.Watt.Hour;
row[E_CLUTCH_POS] = modData.EngineWorkPositive().ConvertTo().Kilo.Watt.Hour;
row[E_CLUTCH_NEG] = modData.EngineWorkNegative().ConvertTo().Kilo.Watt.Hour;
row[E_FCMAP_POS] = modData.TotalEngineWorkPositive().ConvertTo().Kilo.Watt.Hour;
diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj
index 757e6a811a36b9553b9b630ccf2dec1a388b75a2..410cbea093cd628ece39ab5757134456891883aa 100644
--- a/VectoCore/VectoCore/VectoCore.csproj
+++ b/VectoCore/VectoCore/VectoCore.csproj
@@ -138,7 +138,7 @@
<Compile Include="InputData\Reader\ComponentData\AccelerationCurveReader.cs" />
<Compile Include="Models\Declaration\PTOTransmission.cs" />
<Compile Include="Models\Declaration\IDeclarationAuxiliaryTable.cs" />
- <Compile Include="Models\SimulationComponent\Data\AngularGearData.cs" />
+ <Compile Include="Models\SimulationComponent\Data\AngledriveData.cs" />
<Compile Include="InputData\Reader\ComponentData\TransmissionLossMapReader.cs" />
<Compile Include="InputData\Reader\ComponentData\RetarderLossMapReader.cs" />
<Compile Include="InputData\Reader\ComponentData\TorqueConverterDataReader.cs" />
@@ -195,7 +195,7 @@
<Compile Include="Models\SimulationComponent\IDrivingCycleInfo.cs" />
<Compile Include="Models\SimulationComponent\IAuxPort.cs" />
<Compile Include="Models\SimulationComponent\Impl\AMTShiftStrategy.cs" />
- <Compile Include="Models\SimulationComponent\Impl\AngularGear.cs" />
+ <Compile Include="Models\SimulationComponent\Impl\Angledrive.cs" />
<Compile Include="Models\SimulationComponent\Impl\Brakes.cs" />
<Compile Include="Models\SimulationComponent\Impl\BusAuxiliariesAdapter.cs" />
<Compile Include="Models\SimulationComponent\Impl\CycleGearbox.cs" />
diff --git a/VectoCore/VectoCoreTest/FileIO/JsonTest.cs b/VectoCore/VectoCoreTest/FileIO/JsonTest.cs
index 766788df7b2e698160a01ff8f13f8f477a96dd25..00fe6de361ed1f4e1f65e2cd758754a561f63e0e 100644
--- a/VectoCore/VectoCoreTest/FileIO/JsonTest.cs
+++ b/VectoCore/VectoCoreTest/FileIO/JsonTest.cs
@@ -94,8 +94,8 @@ namespace TUGraz.VectoCore.Tests.FileIO
var json = (JObject)JToken.ReadFrom(new JsonTextReader(File.OpenText(TestJobFile)));
((JObject)json["Body"]).Property("Cycles").Remove();
- AssertHelper.Exception<InvalidFileFormatException>(
- () => { var tmp = new JSONInputDataV2(json, TestJobFile).Cycles; }, "Key Cycles not found");
+ var tmp = new JSONInputDataV2(json, TestJobFile).Cycles;
+ Assert.AreEqual(0, tmp.Count);
}
[TestMethod]
@@ -115,10 +115,9 @@ namespace TUGraz.VectoCore.Tests.FileIO
var json = (JObject)JToken.ReadFrom(new JsonTextReader(File.OpenText(TestJobFile)));
((JObject)json["Body"]).Property("VACC").Remove();
- AssertHelper.Exception<VectoException>(() => {
- IEngineeringInputDataProvider input = new JSONInputDataV2(json, TestJobFile);
- var tmp = input.DriverInputData.AccelerationCurve;
- }, "AccelerationCurve (VACC) required");
+ IEngineeringInputDataProvider input = new JSONInputDataV2(json, TestJobFile);
+ var tmp = input.DriverInputData.AccelerationCurve;
+ Assert.IsNull(tmp);
}
[TestMethod]
@@ -277,10 +276,10 @@ namespace TUGraz.VectoCore.Tests.FileIO
public void JSON_Read_AngleGear()
{
var json = (JObject)JToken.ReadFrom(new JsonTextReader(File.OpenText(TestVehicleFile)));
- var angleGear = json["Body"]["AngularGear"];
+ var angleGear = json["Body"]["Angledrive"];
- Assert.AreEqual(AngularGearType.SeparateAngularGear,
- angleGear["Type"].Value<string>().ParseEnum<AngularGearType>());
+ Assert.AreEqual(AngledriveType.SeparateAngledrive,
+ angleGear["Type"].Value<string>().ParseEnum<AngledriveType>());
Assert.AreEqual(3.5, angleGear["Ratio"].Value<double>());
Assert.AreEqual("AngleGear.vtlm", angleGear["LossMap"].Value<string>());
}
diff --git a/VectoCore/VectoCoreTest/Integration/ATPowerTrain.cs b/VectoCore/VectoCoreTest/Integration/ATPowerTrain.cs
index cb5971d3e6210eaa1d152a60bdbf414c5c420204..b53a86c0bc97f8ae68f698c3e7e6560cb0d6eba5 100644
--- a/VectoCore/VectoCoreTest/Integration/ATPowerTrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/ATPowerTrain.cs
@@ -175,7 +175,7 @@ namespace TUGraz.VectoCore.Tests.Integration
AccelerationCurve = AccelerationCurveReader.ReadFromFile(accelerationFile),
LookAheadCoasting = new DriverData.LACData {
Enabled = true,
- //MinSpeed = 50.KMPHtoMeterPerSecond(),
+ MinSpeed = 50.KMPHtoMeterPerSecond(),
//Deceleration = -0.5.SI<MeterPerSquareSecond>()
LookAheadDistanceFactor = DeclarationData.Driver.LookAhead.LookAheadDistanceFactor,
LookAheadDecisionFactor = new LACDecisionFactor()
diff --git a/VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs b/VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs
index 29e2aa7d5cabf7cd2b9a2dab8f9f477ae02f27c4..3018ddcc37b1068f3175d9f4cb4141a43996d7be 100644
--- a/VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs
@@ -193,7 +193,7 @@ namespace TUGraz.VectoCore.Tests.Integration
AccelerationCurve = AccelerationCurveReader.ReadFromFile(accelerationFile),
LookAheadCoasting = new DriverData.LACData {
Enabled = true,
- //MinSpeed = 50.KMPHtoMeterPerSecond(),
+ MinSpeed = 50.KMPHtoMeterPerSecond(),
//Deceleration = -0.5.SI<MeterPerSquareSecond>()
LookAheadDistanceFactor = DeclarationData.Driver.LookAhead.LookAheadDistanceFactor,
LookAheadDecisionFactor = new LACDecisionFactor()
diff --git a/VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs b/VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs
index 5c4738dfb0e3e13021ec05da297df9e5342a0fd0..549d9d70cb022f715673b560d3b1e6265568a0f6 100644
--- a/VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs
@@ -196,7 +196,7 @@ namespace TUGraz.VectoCore.Tests.Integration
AccelerationCurve = AccelerationCurveReader.ReadFromFile(accelerationFile),
LookAheadCoasting = new DriverData.LACData {
Enabled = true,
- //MinSpeed = 50.KMPHtoMeterPerSecond(),
+ MinSpeed = 50.KMPHtoMeterPerSecond(),
//Deceleration = -0.5.SI<MeterPerSquareSecond>()
LookAheadDistanceFactor = DeclarationData.Driver.LookAhead.LookAheadDistanceFactor,
LookAheadDecisionFactor = new LACDecisionFactor()
diff --git a/VectoCore/VectoCoreTest/Integration/Truck40tPowerTrain.cs b/VectoCore/VectoCoreTest/Integration/Truck40tPowerTrain.cs
index c9802f412b3ba5d4eb9a49547d4b16a3ca8fa052..10a8ec888a00f89542499485920945f1a43a3d18 100644
--- a/VectoCore/VectoCoreTest/Integration/Truck40tPowerTrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/Truck40tPowerTrain.cs
@@ -230,7 +230,7 @@ namespace TUGraz.VectoCore.Tests.Integration
AccelerationCurve = AccelerationCurveReader.ReadFromFile(accelerationFile),
LookAheadCoasting = new DriverData.LACData {
Enabled = true,
- //MinSpeed = 50.KMPHtoMeterPerSecond(),
+ MinSpeed = 50.KMPHtoMeterPerSecond(),
//Deceleration = -0.5.SI<MeterPerSquareSecond>(),
LookAheadDistanceFactor = DeclarationData.Driver.LookAhead.LookAheadDistanceFactor,
LookAheadDecisionFactor = new LACDecisionFactor()
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/ATGearboxTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/ATGearboxTest.cs
index 8f62fa8781c58895e69be14ce963eb9e57726f2c..e46ffa316d80812ba9b2c27e985b445fb4850db8 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/ATGearboxTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/ATGearboxTest.cs
@@ -27,10 +27,10 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
TestCase(5, 600, 1),
TestCase(15, 100, 3),
TestCase(15, 300, 3),
- TestCase(15, 600, 2),
+ TestCase(15, 600, 3),
TestCase(40, 100, 6),
- TestCase(40, 300, 5),
- TestCase(40, 600, 4),
+ TestCase(40, 300, 6),
+ TestCase(40, 600, 6),
TestCase(70, 100, 6),
TestCase(70, 300, 6),
TestCase(70, 600, 6),
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs
index 8fcede0aed487fe85f923f6fcf318a51f8d626ad..d04e0b9a0a4621521d83ac14837cde58e7592d9a 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs
@@ -74,7 +74,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
public const string AxleGearValidRangeDataFile = @"TestData\Components\AxleGearValidRange.vgbx";
public const string AxleGearInvalidRangeDataFile = @"TestData\Components\AxleGearInvalidRange.vgbx";
- public const string AngularGearLossMap = @"TestData\Components\AngleGear.vtlm";
+ public const string AngledriveLossMap = @"TestData\Components\AngleGear.vtlm";
private static GearboxData CreateGearboxData()
{
@@ -152,7 +152,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
}
[TestCase(520, 20.320, 279698.4, 9401.44062, 3.240355)]
- public void AngularGear_Losses(double rdyn, double speed, double power, double expectedLoss, double ratio)
+ public void Angledrive_Losses(double rdyn, double speed, double power, double expectedLoss, double ratio)
{
// convert to SI
var angSpeed = SpeedToAngularSpeed(speed, rdyn);
@@ -162,24 +162,24 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
// setup components
var vehicle = new VehicleContainer(ExecutionMode.Engineering);
- var angularGearData = new AngularGearData {
- AngularGear = new TransmissionData {
- LossMap = TransmissionLossMapReader.Create(VectoCSVFile.Read(AngularGearLossMap), ratio, "AngularGear"),
+ var angledriveData = new AngledriveData {
+ Angledrive = new TransmissionData {
+ LossMap = TransmissionLossMapReader.Create(VectoCSVFile.Read(AngledriveLossMap), ratio, "Angledrive"),
Ratio = ratio
}
};
var mockPort = new MockTnOutPort();
- var angularGear = new AngularGear(vehicle, angularGearData);
- angularGear.InPort().Connect(mockPort);
+ var angledrive = new Angledrive(vehicle, angledriveData);
+ angledrive.InPort().Connect(mockPort);
// issue request
- angularGear.Request(0.SI<Second>(), 1.SI<Second>(), torqueToWheels, angSpeed);
+ angledrive.Request(0.SI<Second>(), 1.SI<Second>(), torqueToWheels, angSpeed);
// test
- AssertHelper.AreRelativeEqual(angSpeed * angularGearData.AngularGear.Ratio, mockPort.AngularVelocity,
+ AssertHelper.AreRelativeEqual(angSpeed * angledriveData.Angledrive.Ratio, mockPort.AngularVelocity,
"AngularVelocity Engine Side");
- AssertHelper.AreRelativeEqual((PvD + loss) / (angSpeed * angularGearData.AngularGear.Ratio), mockPort.Torque,
+ AssertHelper.AreRelativeEqual((PvD + loss) / (angSpeed * angledriveData.Angledrive.Ratio), mockPort.Torque,
"Torque Engine Side");
}
diff --git a/VectoCore/VectoCoreTest/TestData/Components/24t Coach.vveh b/VectoCore/VectoCoreTest/TestData/Components/24t Coach.vveh
index 3f4d1f757e89e62e07a036ba192eaa68ab1fbc42..0286a631b162674c7eb29cb901c479bfe697da9b 100644
--- a/VectoCore/VectoCoreTest/TestData/Components/24t Coach.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Components/24t Coach.vveh
@@ -22,8 +22,8 @@
"Ratio": 1.0,
"File": "Retarder.vrlm"
},
- "AngularGear": {
- "Type" : "SeparateAngularGear",
+ "Angledrive": {
+ "Type" : "SeparateAngledrive",
"Ratio": 3.5,
"LossMap": "AngleGear.vtlm"
},
diff --git a/VectoCore/VectoCoreTest/TestData/Components/24t Coach_Ang_Efficiency.vveh b/VectoCore/VectoCoreTest/TestData/Components/24t Coach_Ang_Efficiency.vveh
index 9da3421752f4ca9e034cbd387db7a93300e6cbf6..1c26b4d2ba4e252678eadaafa7b49ecc2eb010bf 100644
--- a/VectoCore/VectoCoreTest/TestData/Components/24t Coach_Ang_Efficiency.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Components/24t Coach_Ang_Efficiency.vveh
@@ -22,8 +22,8 @@
"Ratio": 1.0,
"File": "Retarder.vrlm"
},
- "AngularGear": {
- "Type" : "SeparateAngularGear",
+ "Angledrive": {
+ "Type" : "SeparateAngledrive",
"Ratio": 3.5,
"Efficiency": "0.95"
},
diff --git a/VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck AngleEfficiency.vveh b/VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck AngleEfficiency.vveh
index 977e03d4ce6d69783200683fd9659efcde925928..50fdc0d3eca049c3ce81f9614044ed75ba5159b7 100644
--- a/VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck AngleEfficiency.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck AngleEfficiency.vveh
@@ -22,8 +22,8 @@
"Ratio": 1.0,
"File": "Retarder.vrlm"
},
- "AngularGear": {
- "Type": "SeparateAngularGear",
+ "Angledrive": {
+ "Type": "SeparateAngledrive",
"Ratio": 1.0,
"Efficiency": 0.95
},
diff --git a/VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck.vveh b/VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck.vveh
index 548a9025027221c9bfe3cde2ed6691528fa1c812..8257fd4419d5dc94f2fb20af26becea8036adc84 100644
--- a/VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck.vveh
@@ -22,8 +22,8 @@
"Ratio": 1.0,
"File": "Retarder.vrlm"
},
- "AngularGear": {
- "Type": "SeparateAngularGear",
+ "Angledrive": {
+ "Type": "SeparateAngledrive",
"Ratio": 1.0,
"LossMap": "AngleGear.vtlm"
},
diff --git a/VectoCore/VectoCoreTest/TestData/Components/AT_GBX/GearboxPowerSplit.vgbx b/VectoCore/VectoCoreTest/TestData/Components/AT_GBX/GearboxPowerSplit.vgbx
index c9f9715f9027e5bf754bbf7a9862c4c389dc6386..e6667e5d17fb988d41a51d14f2f1f4bc48a7220f 100644
--- a/VectoCore/VectoCoreTest/TestData/Components/AT_GBX/GearboxPowerSplit.vgbx
+++ b/VectoCore/VectoCoreTest/TestData/Components/AT_GBX/GearboxPowerSplit.vgbx
@@ -18,19 +18,19 @@
{
"Ratio": 1.35,
"Efficiency": "0.98",
- "ShiftPolygon": "<NOFILE>",
+ "ShiftPolygon": "AT-Shift.vgbs",
"FullLoadCurve": "<NOFILE>"
},
{
"Ratio": 1.0,
"Efficiency": "0.98",
- "ShiftPolygon": "<NOFILE>",
+ "ShiftPolygon": "AT-Shift.vgbs",
"FullLoadCurve": "<NOFILE>"
},
{
"Ratio": 0.73,
"Efficiency": "0.98",
- "ShiftPolygon": "<NOFILE>",
+ "ShiftPolygon": "AT-Shift.vgbs",
"FullLoadCurve": "<NOFILE>"
},
],
@@ -45,6 +45,7 @@
"TorqueConverter": {
"Enabled": true,
"File": "TorqueConverterPowerSplit.vtcc",
+ "ShiftPolygon": "AT-Shift.vgbs",
"RefRPM": 1000.0,
"Inertia": 0.0
},
diff --git a/VectoCore/VectoCoreTest/TestData/Components/AT_GBX/GearboxSerialDualTC.vgbx b/VectoCore/VectoCoreTest/TestData/Components/AT_GBX/GearboxSerialDualTC.vgbx
index bc75d4a29bb2fc061fb91354db454a26a127bc4a..350c4602373e90054485362db955f09e2a4104a9 100644
--- a/VectoCore/VectoCoreTest/TestData/Components/AT_GBX/GearboxSerialDualTC.vgbx
+++ b/VectoCore/VectoCoreTest/TestData/Components/AT_GBX/GearboxSerialDualTC.vgbx
@@ -18,31 +18,31 @@
{
"Ratio": 4.35,
"Efficiency": "0.98",
- "ShiftPolygon": "<NOFILE>",
+ "ShiftPolygon": "AT-Shift.vgbs",
"FullLoadCurve": "<NOFILE>"
},
{
"Ratio": 2.4,
"Efficiency": "0.98",
- "ShiftPolygon": "<NOFILE>",
+ "ShiftPolygon": "AT-Shift.vgbs",
"FullLoadCurve": "<NOFILE>"
},
{
"Ratio": 1.8,
"Efficiency": "0.98",
- "ShiftPolygon": "<NOFILE>",
+ "ShiftPolygon": "AT-Shift.vgbs",
"FullLoadCurve": "<NOFILE>"
},
{
"Ratio": 1.3,
"Efficiency": "0.98",
- "ShiftPolygon": "<NOFILE>",
+ "ShiftPolygon": "AT-Shift.vgbs",
"FullLoadCurve": "<NOFILE>"
},
{
"Ratio": 1.0,
"Efficiency": "0.98",
- "ShiftPolygon": "<NOFILE>",
+ "ShiftPolygon": "AT-Shift.vgbs",
"FullLoadCurve": "<NOFILE>"
}
],
@@ -57,6 +57,7 @@
"TorqueConverter": {
"Enabled": true,
"File": "TorqueConverter.vtcc",
+ "ShiftPolygon": "AT-Shift.vgbs",
"RefRPM": 1000.0,
"Inertia": 0.0
},