diff --git a/VECTO/My Project/Resources.Designer.vb b/VECTO/My Project/Resources.Designer.vb
index 84df2c20d429d756c2c3d1ed36ec52fe84bd428d..638b661dbe71b41ab5b39727007b3d9b78a8d27b 100644
--- a/VECTO/My Project/Resources.Designer.vb
+++ b/VECTO/My Project/Resources.Designer.vb
@@ -1,10 +1,10 @@
'------------------------------------------------------------------------------
' <auto-generated>
-' Dieser Code wurde von einem Tool generiert.
-' Laufzeitversion:4.0.30319.42000
+' This code was generated by a tool.
+' Runtime Version:4.0.30319.42000
'
-' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-' der Code erneut generiert wird.
+' Changes to this file may cause incorrect behavior and will be lost if
+' the code is regenerated.
' </auto-generated>
'------------------------------------------------------------------------------
@@ -15,12 +15,12 @@ Imports System
Namespace My.Resources
- '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.
+ '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.
'''<summary>
- ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+ ''' A strongly-typed resource class, for looking up localized strings, etc.
'''</summary>
<Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
@@ -33,7 +33,7 @@ Namespace My.Resources
Private resourceCulture As Global.System.Globalization.CultureInfo
'''<summary>
- ''' Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+ ''' Returns the cached ResourceManager instance used by this class.
'''</summary>
<Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
@@ -47,8 +47,8 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
- ''' Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+ ''' Overrides the current thread's CurrentUICulture property for all
+ ''' resource lookups using this strongly typed resource class.
'''</summary>
<Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Friend Property Culture() As Global.System.Globalization.CultureInfo
@@ -61,7 +61,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property _4x2r() As System.Drawing.Bitmap
Get
@@ -71,7 +71,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property _4x2rt() As System.Drawing.Bitmap
Get
@@ -81,7 +81,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property _4x2tt() As System.Drawing.Bitmap
Get
@@ -91,7 +91,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property _6x2r() As System.Drawing.Bitmap
Get
@@ -101,7 +101,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property _6x2rt() As System.Drawing.Bitmap
Get
@@ -111,7 +111,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property _6x2tt() As System.Drawing.Bitmap
Get
@@ -121,7 +121,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property Actions_arrow_down_icon() As System.Drawing.Bitmap
Get
@@ -131,7 +131,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property Actions_arrow_up_icon() As System.Drawing.Bitmap
Get
@@ -141,7 +141,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property Actions_document_save_as_icon() As System.Drawing.Bitmap
Get
@@ -151,7 +151,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property Actions_document_save_icon() As System.Drawing.Bitmap
Get
@@ -161,7 +161,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property application_add_icon() As System.Drawing.Bitmap
Get
@@ -171,7 +171,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property application_export_icon_small() As System.Drawing.Bitmap
Get
@@ -181,7 +181,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property blue_document_icon() As System.Drawing.Bitmap
Get
@@ -191,7 +191,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property bus4x2() As System.Drawing.Bitmap
Get
@@ -201,7 +201,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property bus4x21() As System.Drawing.Bitmap
Get
@@ -211,7 +211,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property bus6x2() As System.Drawing.Bitmap
Get
@@ -221,7 +221,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property bus6x21() As System.Drawing.Bitmap
Get
@@ -231,7 +231,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property bus8x2() As System.Drawing.Bitmap
Get
@@ -241,7 +241,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property bus8x21() As System.Drawing.Bitmap
Get
@@ -251,7 +251,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property Delete() As System.Drawing.Bitmap
Get
@@ -261,7 +261,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property desktop() As System.Drawing.Bitmap
Get
@@ -271,7 +271,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property driverModelEquation() As System.Drawing.Bitmap
Get
@@ -281,7 +281,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property export_icon() As System.Drawing.Bitmap
Get
@@ -291,7 +291,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property F_ENG() As System.Drawing.Bitmap
Get
@@ -301,7 +301,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property F_GBX() As System.Drawing.Bitmap
Get
@@ -311,7 +311,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property F_Graph() As System.Drawing.Bitmap
Get
@@ -321,7 +321,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property F_VECTO() As System.Drawing.Bitmap
Get
@@ -331,7 +331,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property F_VEH() As System.Drawing.Bitmap
Get
@@ -341,7 +341,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property favorites() As System.Drawing.Bitmap
Get
@@ -351,7 +351,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property file_history() As System.Drawing.Bitmap
Get
@@ -361,7 +361,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property Help_icon() As System.Drawing.Bitmap
Get
@@ -371,7 +371,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
+ ''' Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
'''</summary>
Friend ReadOnly Property Icon2() As System.Drawing.Icon
Get
@@ -381,7 +381,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property Information_icon() As System.Drawing.Bitmap
Get
@@ -391,7 +391,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property IVT_91x44() As System.Drawing.Bitmap
Get
@@ -401,7 +401,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property IVT_About() As System.Drawing.Bitmap
Get
@@ -411,7 +411,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property JRC_About() As System.Drawing.Bitmap
Get
@@ -421,7 +421,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property minus_circle_icon() As System.Drawing.Bitmap
Get
@@ -431,7 +431,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property Misc_Tools_icon() As System.Drawing.Bitmap
Get
@@ -441,7 +441,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property new_dir() As System.Drawing.Bitmap
Get
@@ -451,7 +451,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property Open_icon() As System.Drawing.Bitmap
Get
@@ -461,7 +461,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property P_fan_eqn() As System.Drawing.Bitmap
Get
@@ -471,7 +471,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property Play_icon() As System.Drawing.Bitmap
Get
@@ -481,7 +481,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property Play_icon_gray() As System.Drawing.Bitmap
Get
@@ -491,7 +491,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property plus_circle_icon() As System.Drawing.Bitmap
Get
@@ -501,7 +501,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property Refresh_icon() As System.Drawing.Bitmap
Get
@@ -511,7 +511,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property rigid8x4() As System.Drawing.Bitmap
Get
@@ -521,7 +521,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property rigid8x41() As System.Drawing.Bitmap
Get
@@ -531,7 +531,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property Status_dialog_password_icon() As System.Drawing.Bitmap
Get
@@ -541,7 +541,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property Stop_icon() As System.Drawing.Bitmap
Get
@@ -551,7 +551,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property TUG_91x34() As System.Drawing.Bitmap
Get
@@ -561,7 +561,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property TUG_About() As System.Drawing.Bitmap
Get
@@ -571,7 +571,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property Undef() As System.Drawing.Bitmap
Get
@@ -581,7 +581,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property up_directory() As System.Drawing.Bitmap
Get
@@ -591,7 +591,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property van() As System.Drawing.Bitmap
Get
@@ -601,7 +601,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property van1() As System.Drawing.Bitmap
Get
@@ -611,7 +611,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property VECTO_About() As System.Drawing.Bitmap
Get
@@ -621,7 +621,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property VECTO_ENG() As System.Drawing.Bitmap
Get
@@ -631,7 +631,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property VECTO_GBX() As System.Drawing.Bitmap
Get
@@ -641,7 +641,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property VECTO_Mainform() As System.Drawing.Bitmap
Get
@@ -651,7 +651,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property VECTO_VECTO() As System.Drawing.Bitmap
Get
@@ -661,7 +661,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property VECTO_VEH() As System.Drawing.Bitmap
Get
diff --git a/VECTO/My Project/Resources.resx b/VECTO/My Project/Resources.resx
index 1045b00e4cc0a5b91632f7a594f182017c543d93..1bcc3c9d5375472abf953dfac46fba95e5dbb676 100644
--- a/VECTO/My Project/Resources.resx
+++ b/VECTO/My Project/Resources.resx
@@ -143,7 +143,7 @@
<value>..\Resources\Status-dialog-password-icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="bus4x2" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>C:\Users\raphaelkalchgruber\Pictures\VectoGraphics\bus4x2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <value>..\Resources\bus4x2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Refresh_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Refresh-icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -242,7 +242,7 @@
<value>..\Resources\Play-icon-gray.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="van" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>C:\Users\raphaelkalchgruber\Pictures\VectoGraphics\van.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <value>..\Resources\van.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -266,10 +266,10 @@
<value>..\Resources\driverModelEquation.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="bus6x2" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>C:\Users\raphaelkalchgruber\Pictures\VectoGraphics\bus6x2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <value>..\Resources\bus6x2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="rigid8x4" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>C:\Users\raphaelkalchgruber\Pictures\VectoGraphics\rigid8x4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <value>..\Resources\rigid8x4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="IVT_91x44" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\IVT_91x44.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -284,7 +284,7 @@
<value>..\Resources\6x2rt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="bus8x2" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>C:\Users\raphaelkalchgruber\Pictures\VectoGraphics\bus8x2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <value>..\Resources\bus8x2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="bus4x21" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\bus4x2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
index fc354f0bc50188cb3114c999f675b56e192f5c0f..5e2803d0b85789fe2d20257f13b98933358bced9 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
@@ -1027,7 +1027,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
PrimaryInputDataFile = Path.Combine(BasePath, Body.GetEx<string>("PrimaryVehicleResults"));
CompletedInputDataFile = Path.Combine(BasePath, Body.GetEx<string>("CompletedVehicle"));
- RunSimulation = Body.GetEx<bool>(JsonKeys.BUS_RunSimulation);
+ RunSimulation = Body.ContainsKey(JsonKeys.BUS_RunSimulation) ? Body.GetEx<bool>(JsonKeys.BUS_RunSimulation) : true;
//PrimaryVehicle = CreateReader(primaryInputData);
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedMultistageBusVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedMultistageBusVectoRunDataFactory.cs
index 7d9a3523e5079a18b21af8309ed0bfc1b1f022fd..389ea812c800e8f01ebebc205423c227804bc632 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedMultistageBusVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedMultistageBusVectoRunDataFactory.cs
@@ -274,6 +274,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
SimulationType = SimulationType.DistanceCycle,
VehicleDesignSpeed = _segmentCompletedBus.DesignSpeed,
GearshiftParameters = _gearshiftData,
+ InputData = InputDataProvider
};
simulationRunData.EngineData.FuelMode = 0;
simulationRunData.VehicleData.VehicleClass = _segmentCompletedBus.VehicleClass;
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeMultistageBusVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeMultistageBusVectoRunDataFactory.cs
index c2c3e20b12a7ccff214dbb7455b067ca4042f1d7..661ce186de76632004b6e569fd3ba5e0cf50d9fc 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeMultistageBusVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeMultistageBusVectoRunDataFactory.cs
@@ -32,7 +32,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
Report = Report,
Mission = new Mission { MissionType = MissionType.ExemptedMission },
VehicleData = CreateVehicleData(InputDataProvider.MultistageJobInputData.JobInputData.PrimaryVehicle.Vehicle),
- MultistageVIFInputData = InputDataProvider
+ MultistageVIFInputData = InputDataProvider,
};
}
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/ExemptedRun.cs b/VectoCore/VectoCore/Models/Simulation/Impl/ExemptedRun.cs
index 8b583724387d32d70b3c492f56aca95c51300818..4d58646be095aabb11b84c849031ac1322fcc22e 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/ExemptedRun.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/ExemptedRun.cs
@@ -35,7 +35,8 @@ using TUGraz.VectoCommon.Models;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.OutputData;
-namespace TUGraz.VectoCore.Models.Simulation.Impl {
+namespace TUGraz.VectoCore.Models.Simulation.Impl
+{
internal class ExemptedRun : VectoRun
{
private Action<ModalDataContainer> _writeSumData;
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/InterimComponents/InterimAirdragType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/InterimComponents/InterimAirdragType.cs
index 03c65264aa420e6eed82a20d3078292739ec6d1b..2c4d5a6fe1580bf18e98cce39c92b345bb04641a 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/InterimComponents/InterimAirdragType.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/InterimComponents/InterimAirdragType.cs
@@ -49,8 +49,9 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
protected XElement GetAirdragElement(XMLDeclarationAirdragDataProviderV20 airdrag)
{
- var retVal = new XElement(v24 + XMLNames.Component_AirDrag,
- new XAttribute("xmlns", v20.NamespaceName));
+ var retVal = new XElement(v24 + XMLNames.Component_AirDrag//,
+ //new XAttribute("xmlns", v20.NamespaceName)
+ );
var tmp = XElement.Load(airdrag.XMLSource.CreateNavigator().ReadSubtree());
retVal.Add(tmp.Elements());
return retVal;
diff --git a/VectoCore/VectoCore/Resources/Declaration/SegmentTable.csv b/VectoCore/VectoCore/Resources/Declaration/SegmentTable.csv
index f1038a9e713e53c26a7cdc6a5a8ac4468a2eb53d..97b85ddd73c15602f73cd1c273c5201127ff4e64 100644
--- a/VectoCore/VectoCore/Resources/Declaration/SegmentTable.csv
+++ b/VectoCore/VectoCore/Resources/Declaration/SegmentTable.csv
@@ -30,9 +30,9 @@ HDV group , Vocational , Valid , Vehicle Category , Axle Conf. , TPMLM_Min , TPM
17 , 0 , 0 , RigidTruck , 8x8 , 0 , 99 , 4 , 85 , , , , , , , Truck.vacc , , , RigidSolo , , , , , , , , , - , - , - , - , - , - , - , - , - , - , - , - , ,
### Medium lorries
-51 , 0 , 1 , RigidTruck , 4x2F , 5 , 7.4 , 3.5 , 85 , B-II , , , , , , Truck.vacc , , , MediumLorriesRigid , , 45/55 , , , , , , , - , - , pc10(R)/pc50(R) , - , pc10(R)/pc50(R) , - , - , - , - , - , - , - , 5.8 ,
-51 , 0 , 1 , Tractor , 4x2F , 5 , 7.4 , 3.5 , 85 , B-II , , , , , , Truck.vacc , , , MediumLorriesRigid , , 45/55 , , , , , , , - , - , pc10(R)/pc50(R) , - , pc10(R)/pc50(R) , - , - , - , - , - , - , - , 5.8 ,
-52 , 0 , 1 , Van , 4x2F , 5 , 7.4 , 2.9 , 85 , , , , , , , Truck.vacc , , , MediumLorriesVan , , 45/55 , , , , , , , - , - , pc10(V)/pc50(V) , - , pc10(V)/pc50(V) , - , - , - , - , - , - , - , 2.5 ,
+51 , 0 , 0 , RigidTruck , 4x2F , 5 , 7.4 , 3.5 , 85 , B-II , , , , , , Truck.vacc , , , MediumLorriesRigid , , 45/55 , , , , , , , - , - , pc10(R)/pc50(R) , - , pc10(R)/pc50(R) , - , - , - , - , - , - , - , 5.8 ,
+51 , 0 , 0 , Tractor , 4x2F , 5 , 7.4 , 3.5 , 85 , B-II , , , , , , Truck.vacc , , , MediumLorriesRigid , , 45/55 , , , , , , , - , - , pc10(R)/pc50(R) , - , pc10(R)/pc50(R) , - , - , - , - , - , - , - , 5.8 ,
+52 , 0 , 0 , Van , 4x2F , 5 , 7.4 , 2.9 , 85 , , , , , , , Truck.vacc , , , MediumLorriesVan , , 45/55 , , , , , , , - , - , pc10(V)/pc50(V) , - , pc10(V)/pc50(V) , - , - , - , - , - , - , - , 2.5 ,
53 , 0 , 1 , RigidTruck , 4x2 , 5 , 7.4 , 3.5 , 85 , B-II , , , , , , Truck.vacc , , , MediumLorriesRigid , , 45/55 , , , , , , , - , - , pc10(R)/pc50(R) , - , pc10(R)/pc50(R) , - , - , - , - , - , - , - , 5.8 ,
53 , 0 , 1 , Tractor , 4x2 , 5 , 7.4 , 3.5 , 85 , B-II , , , , , , Truck.vacc , , , MediumLorriesRigid , , 45/55 , , , , , , , - , - , pc10(R)/pc50(R) , - , pc10(R)/pc50(R) , - , - , - , - , - , - , - , 5.8 ,
54 , 0 , 1 , Van , 4x2 , 5 , 7.4 , 2.9 , 85 , , , , , , , Truck.vacc , , , MediumLorriesVan , , 45/55 , , , , , , , - , - , pc10(V)/pc50(V) , - , pc10(V)/pc50(V) , - , - , - , - , - , - , - , 2.5 ,
diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj
index 03aa0b455d9a33f2519fa07baf44f77e3370af97..80cadb5fade06532d8a012a30b1b7d350ded28f4 100644
--- a/VectoCore/VectoCore/VectoCore.csproj
+++ b/VectoCore/VectoCore/VectoCore.csproj
@@ -101,6 +101,7 @@
<InternalsVisibleTo Include="VectoAuxiliariesTests" />
<InternalsVisibleTo Include="VECTO3" />
<InternalsVisibleTo Include="VECTOMultistage" />
+ <InternalsVisibleTo Include="VectoMockup"/>
<InternalsVisibleTo Include="Vecto3GUI2020Test" />
</ItemGroup>
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
index 9693e144ff62a8a0d1bd9a5a3e7256eeaa8c7bdc..14e2dc004a14fb8a9b07683539f8c208ea275b1c 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
@@ -657,14 +657,14 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
[Test,
- TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x2F, 5000.01, 0, false, VehicleClass.Class51),
- TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x2F, 5000.01, 0, false, VehicleClass.Class52),
+ //TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x2F, 5000.01, 0, false, VehicleClass.Class51),
+ //TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x2F, 5000.01, 0, false, VehicleClass.Class52),
TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x2, 5000.01, 0, false, VehicleClass.Class53),
TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x2, 5000.01, 0, false, VehicleClass.Class53),
TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x2, 5000.01, 0, false, VehicleClass.Class54),
- TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x4, 5000.01, 0, false, VehicleClass.Class55),
- TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x4, 5000.01, 0, false, VehicleClass.Class55),
- TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x4, 5000.01, 0, false, VehicleClass.Class56),
+ //TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x4, 5000.01, 0, false, VehicleClass.Class55),
+ //TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x4, 5000.01, 0, false, VehicleClass.Class55),
+ //TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x4, 5000.01, 0, false, VehicleClass.Class56),
TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x2, 7400.01, 0, false, VehicleClass.Class1s),
TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x2, 7400.01, 0, false, VehicleClass.Class1s),
@@ -734,12 +734,12 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
[
- TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x2F, 5001, 0, false, VehicleClass.Class51, 85),
- TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x2F, 5001, 0, false, VehicleClass.Class52, 85),
+ //TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x2F, 5001, 0, false, VehicleClass.Class51, 85),
+ //TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x2F, 5001, 0, false, VehicleClass.Class52, 85),
TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x2, 5001, 0, false, VehicleClass.Class53, 85),
TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x2, 5001, 0, false, VehicleClass.Class54, 85),
- TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x4, 5001, 0, false, VehicleClass.Class55, 85),
- TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x4, 5001, 0, false, VehicleClass.Class56, 85),
+ //TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x4, 5001, 0, false, VehicleClass.Class55, 85),
+ //TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x4, 5001, 0, false, VehicleClass.Class56, 85),
TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x2, 7401, 0, false, VehicleClass.Class1s, 85),
TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x2, 7501, 0, false, VehicleClass.Class1, 85),
TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x2, 10001, 0, false, VehicleClass.Class2, 85),
@@ -766,24 +766,24 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
[Test,
- TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x2F, 7400, 0, false, VehicleClass.Class51, 800, null,
- TestName = "SegmentLookupBodyWeight Class51 Rigid"),
- TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x2F, 7400, 0, false, VehicleClass.Class51, 800, null,
- TestName = "SegmentLookupBodyWeight Class51 Tractor"),
- TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x2F, 7400, 0, false, VehicleClass.Class52, 0, null,
- TestName = "SegmentLookupBodyWeight Class52 Van"),
+ //TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x2F, 7400, 0, false, VehicleClass.Class51, 800, null,
+ // TestName = "SegmentLookupBodyWeight Class51 Rigid"),
+ //TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x2F, 7400, 0, false, VehicleClass.Class51, 800, null,
+ // TestName = "SegmentLookupBodyWeight Class51 Tractor"),
+ //TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x2F, 7400, 0, false, VehicleClass.Class52, 0, null,
+ // TestName = "SegmentLookupBodyWeight Class52 Van"),
TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x2, 7400, 0, false, VehicleClass.Class53, 800, null,
TestName = "SegmentLookupBodyWeight Class53 Rigid"),
TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x2, 7400, 0, false, VehicleClass.Class53, 800, null,
TestName = "SegmentLookupBodyWeight Class53 Tractor"),
TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x2, 7400, 0, false, VehicleClass.Class54, 0, null,
TestName = "SegmentLookupBodyWeight Class54 Van"),
- TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x4, 7400, 0, false, VehicleClass.Class55, 800, null,
- TestName = "SegmentLookupBodyWeight Class55 Rigid"),
- TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x4, 7400, 0, false, VehicleClass.Class55, 800, null,
- TestName = "SegmentLookupBodyWeight Class55 Tractor"),
- TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x4, 7400, 0, false, VehicleClass.Class56, 0, null,
- TestName = "SegmentLookupBodyWeight ClassML4rvan Van"),
+ //TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x4, 7400, 0, false, VehicleClass.Class55, 800, null,
+ // TestName = "SegmentLookupBodyWeight Class55 Rigid"),
+ //TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x4, 7400, 0, false, VehicleClass.Class55, 800, null,
+ // TestName = "SegmentLookupBodyWeight Class55 Tractor"),
+ //TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x4, 7400, 0, false, VehicleClass.Class56, 0, null,
+ // TestName = "SegmentLookupBodyWeight ClassML4rvan Van"),
TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x2, 7500, 0, false, VehicleClass.Class1s, 1600, null,
TestName = "SegmentLookupBodyWeight Class1s Rigid"),
TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x2, 7500, 0, false, VehicleClass.Class1s, 1600, null,
@@ -836,12 +836,12 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
[Test,
- TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x2F, 7400, 0, false, VehicleClass.Class51, 3.5,
- TestName = "SegmentLookupHeight Class51 Rigid"),
- TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x2F, 7400, 0, false, VehicleClass.Class51, 3.5,
- TestName = "SegmentLookupHeight Class51 Tractor"),
- TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x2F, 7400, 0, false, VehicleClass.Class52, 2.9,
- TestName = "SegmentLookupHeight Class52 Van"),
+ //TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x2F, 7400, 0, false, VehicleClass.Class51, 3.5,
+ // TestName = "SegmentLookupHeight Class51 Rigid"),
+ //TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x2F, 7400, 0, false, VehicleClass.Class51, 3.5,
+ // TestName = "SegmentLookupHeight Class51 Tractor"),
+ //TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x2F, 7400, 0, false, VehicleClass.Class52, 2.9,
+ // TestName = "SegmentLookupHeight Class52 Van"),
TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x2, 7400, 0, false, VehicleClass.Class53, 3.5,
TestName = "SegmentLookupHeight Class53 Rigid"),
@@ -850,12 +850,12 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x2, 7400, 0, false, VehicleClass.Class54, 2.9,
TestName = "SegmentLookupHeight Class54 Van"),
- TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x4, 7400, 0, false, VehicleClass.Class55, 3.5,
- TestName = "SegmentLookupHeight Class55 Rigid"),
- TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x4, 7400, 0, false, VehicleClass.Class55, 3.5,
- TestName = "SegmentLookupHeight Class55 Tractor"),
- TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x4, 7400, 0, false, VehicleClass.Class56, 2.9,
- TestName = "SegmentLookupHeight Class56 Van"),
+ //TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x4, 7400, 0, false, VehicleClass.Class55, 3.5,
+ // TestName = "SegmentLookupHeight Class55 Rigid"),
+ //TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x4, 7400, 0, false, VehicleClass.Class55, 3.5,
+ // TestName = "SegmentLookupHeight Class55 Tractor"),
+ //TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x4, 7400, 0, false, VehicleClass.Class56, 2.9,
+ // TestName = "SegmentLookupHeight Class56 Van"),
TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x2, 7500, 0, false, VehicleClass.Class1s, 3.6,
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponentData/ElectricMotorEfficienyMapTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/ElectricMotorEfficienyMapTest.cs
index 9b0647917dbe51d0e5a9bb887b3447ca4a58c50b..c344ebda36e955dc76d7325e6db721e5811aff2f 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponentData/ElectricMotorEfficienyMapTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponentData/ElectricMotorEfficienyMapTest.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Data;
using System.IO;
using System.Linq;
-using System.Windows.Forms;
using NUnit.Framework;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
index 8d93aad851c7d29011bf895d226cc7d029f47800..91d1eca96e8e3dfb710f2aa03b8f657ba725a89a 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
@@ -1,14 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
-<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
-xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
-xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
+<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
+xmlns:di="http://www.w3.org/2000/09/xmldsig#"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
+xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
+xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
<Data xsi:type="PrimaryVehicleDataType" id="PIF-584956b9e3ab43acaf97">
- <Vehicle xsi:type="VehiclePIFType">
- <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
- <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+ <Vehicle xsi:type="ConventionalVehicleVIFType">
+ <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model Primary</Model>
<VIN>VEH-1234567890_SmartPS</VIN>
<Date>2017-02-15T11:00:00Z</Date>
@@ -22,12 +26,12 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<RetarderRatio>1.000</RetarderRatio>
<AngledriveType>None</AngledriveType>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
- <ADAS xmlns:adas="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xsi:type="adas:AdvancedDriverAssistantSystemsType">
- <adas:EngineStopStart>false</adas:EngineStopStart>
- <adas:EcoRollWithoutEngineStop>false</adas:EcoRollWithoutEngineStop>
- <adas:EcoRollWithEngineStop>false</adas:EcoRollWithEngineStop>
- <adas:PredictiveCruiseControl>none</adas:PredictiveCruiseControl>
- </ADAS>
+ <vif:ADAS xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:type="ADAS_Conventional_Type">
+ <EngineStopStart>false</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ </vif:ADAS>
<TorqueLimits xmlns:tcl="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="tcl:TorqueLimitsType">
<tcl:Entry gear="6" maxTorque="1800"/>
<tcl:Entry gear="1" maxTorque="2500"/>
@@ -35,7 +39,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</TorqueLimits>
<Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
<Engine>
- <Data xsi:type="EngineDataPIFType">
+ <Data xsi:type="EngineDataVIFType">
<Manufacturer>Generic Engine Manufacturer Primary</Manufacturer>
<Model>Bus 6x2 Engine</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -46,9 +50,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<RatedPower>325032</RatedPower>
<MaxEngineTorque>2134</MaxEngineTorque>
<WHRType>
- <MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</MechanicalOutputICE>
- <MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</MechanicalOutputDrivetrain>
- <ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</ElectricalOutput>
+ <MechanicalOutputICE>false</MechanicalOutputICE>
+ <MechanicalOutputDrivetrain>false</MechanicalOutputDrivetrain>
+ <ElectricalOutput>false</ElectricalOutput>
</WHRType>
<Mode>
<IdlingSpeed>600</IdlingSpeed>
@@ -71,14 +75,14 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Engine>
<Transmission>
- <Data xsi:type="TransmissionDataPIFType">
+ <Data xsi:type="TransmissionDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer Primary</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox Primary</Model>
<MainCertificationMethod>Standard values</MainCertificationMethod>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
- <Gears xsi:type="TransmissionGearsPIFType">
+ <Gears xsi:type="TransmissionGearsVIFType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
@@ -132,7 +136,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Transmission>
<Axlegear>
- <Data xsi:type="AxlegearDataPIFType">
+ <Data xsi:type="AxlegearDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear Primary</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -143,12 +147,12 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Axlegear>
<AxleWheels>
- <Data xsi:type="AxleWheelsDataPIFType">
+ <Data xsi:type="AxleWheelsDataVIFType">
<!-- <AxleWheels xmlns:pbus="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleWheelsComponentDeclarationType">
<Data xsi:type="AxleWheelsDataDeclarationType">
-->
<Axles>
- <vif0.1:Axle axleNumber="1" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <vif:Axle axleNumber="1" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>true</Steered>
@@ -174,8 +178,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</di:Reference>
</Signature>
</Tyre>
- </vif0.1:Axle>
- <vif0.1:Axle axleNumber="2" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ </vif:Axle>
+ <vif:Axle axleNumber="2" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<AxleType>VehicleDriven</AxleType>
<TwinTyres>true</TwinTyres>
<Steered>false</Steered>
@@ -201,8 +205,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</di:Reference>
</Signature>
</Tyre>
- </vif0.1:Axle>
- <vif0.1:Axle axleNumber="3" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ </vif:Axle>
+ <vif:Axle axleNumber="3" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>false</Steered>
@@ -228,12 +232,12 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</di:Reference>
</Signature>
</Tyre>
- </vif0.1:Axle>
+ </vif:Axle>
</Axles>
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xmlns:aux="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xsi:type="AuxiliaryDataPIFType">
+ <Data xsi:type="AUX_Conventional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -285,7 +289,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Results>
<Status>success</Status>
<Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
@@ -296,10 +300,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">21.22359</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1555.73</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
@@ -310,10 +313,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">25.40945</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1862.57</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
@@ -324,10 +326,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">16.74101</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1227.15</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
@@ -338,10 +339,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">20.24221</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1483.80</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
@@ -352,10 +352,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">14.34578</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1051.58</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
@@ -366,10 +365,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">17.60016</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1290.13</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
@@ -380,10 +378,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">22.72091</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1665.49</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
@@ -394,10 +391,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">27.95930</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">2049.48</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
@@ -408,10 +404,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">17.90756</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1312.66</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
@@ -422,10 +417,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">22.23796</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1630.09</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
@@ -436,10 +430,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">15.28035</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1120.08</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
@@ -450,10 +443,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">19.26201</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1411.95</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16239.55</TotalVehicleMass>
@@ -464,10 +456,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.82464</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">866.77</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">19319.21</TotalVehicleMass>
@@ -478,10 +469,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.32341</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">976.63</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34SD</PrimaryVehicleSubgroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16490.49</TotalVehicleMass>
@@ -492,10 +482,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">8.71847</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">639.08</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34SD</PrimaryVehicleSubgroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">18406.72</TotalVehicleMass>
@@ -506,10 +495,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">9.20255</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">674.57</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34DD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">19298.40</TotalVehicleMass>
@@ -520,10 +508,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.44807</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">985.77</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34DD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">23643.60</TotalVehicleMass>
@@ -534,10 +521,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">15.56740</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1141.12</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34DD</PrimaryVehicleSubgroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">19703.95</TotalVehicleMass>
@@ -548,10 +534,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">9.82937</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">720.51</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34DD</PrimaryVehicleSubgroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">22484.88</TotalVehicleMass>
@@ -562,7 +547,6 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">10.56728</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">774.60</CO2>
</Result>
</Results>
<ApplicationInformation>
@@ -582,14 +566,14 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Signature>
</PrimaryVehicle>
<ManufacturingStep stepCount="2">
- <Data xsi:type="vif0.1:BusManufacturingStepDataType" id="asdf">
+ <Data xsi:type="BusManufacturingStepDataType" id="asdf">
<HashPreviousStep>
<di:Reference>
<di:DigestMethod Algorithm=""/>
<di:DigestValue/>
</di:Reference>
</HashPreviousStep>
- <vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MST-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+ <vif:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MST-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
<VIN>VEH-1234567890</VIN>
@@ -665,7 +649,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Auxiliaries>
</Components>
- </vif0.1:Vehicle>
+ </vif:Vehicle>
<ApplicationInformation>
<SimulationToolVersion>0.6.1.1957-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
<Date>2020-05-27T08:16:48.0278823Z</Date>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_VIF.xml
index 6a587688490a2f7a3b6d136bf63e19de42075882..fcc061ae8b16686cda3f7de55f9c53973fe2f9f9 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_VIF.xml
@@ -3,14 +3,13 @@
xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
-xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
-
-xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
<Data xsi:type="PrimaryVehicleDataType" id="PIF-4121ae4751874cefa376">
- <Vehicle xsi:type="VehiclePIFType">
- <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
- <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+ <Vehicle xsi:type="ConventionalVehicleVIFType">
+ <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_nonSmart</VIN>
<Date>2017-02-15T11:00:00Z</Date>
@@ -24,19 +23,19 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<RetarderRatio>1.000</RetarderRatio>
<AngledriveType>None</AngledriveType>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
- <ADAS xmlns:adas="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xsi:type="adas:AdvancedDriverAssistantSystemsType">
- <adas:EngineStopStart>false</adas:EngineStopStart>
- <adas:EcoRollWithoutEngineStop>false</adas:EcoRollWithoutEngineStop>
- <adas:EcoRollWithEngineStop>false</adas:EcoRollWithEngineStop>
- <adas:PredictiveCruiseControl>none</adas:PredictiveCruiseControl>
- </ADAS>
+ <vif:ADAS xsi:type="ADAS_Conventional_Type" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" >
+ <EngineStopStart>false</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ </vif:ADAS>
<TorqueLimits xmlns:tcl="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="tcl:TorqueLimitsType">
<tcl:Entry gear="6" maxTorque="1800"/>
<tcl:Entry gear="1" maxTorque="2500"/>
</TorqueLimits>
<Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
<Engine>
- <Data xsi:type="EngineDataPIFType">
+ <Data xsi:type="EngineDataVIFType">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic primary bus 41 Engine</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -47,9 +46,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<RatedPower>220000</RatedPower>
<MaxEngineTorque>1100</MaxEngineTorque>
<WHRType>
- <v2.3:MechanicalOutputICE>false</v2.3:MechanicalOutputICE>
- <v2.3:MechanicalOutputDrivetrain>false</v2.3:MechanicalOutputDrivetrain>
- <v2.3:ElectricalOutput>false</v2.3:ElectricalOutput>
+ <MechanicalOutputICE>false</MechanicalOutputICE>
+ <MechanicalOutputDrivetrain>false</MechanicalOutputDrivetrain>
+ <ElectricalOutput>false</ElectricalOutput>
</WHRType>
<Mode>
<IdlingSpeed>700</IdlingSpeed>
@@ -74,14 +73,14 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
</Data>
</Engine>
<Transmission>
- <Data xsi:type="TransmissionDataPIFType">
+ <Data xsi:type="TransmissionDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>AT 6 Gear</Model>
<MainCertificationMethod>Standard values</MainCertificationMethod>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>APT-S</TransmissionType>
- <Gears xsi:type="TransmissionGearsPIFType">
+ <Gears xsi:type="TransmissionGearsVIFType">
<Gear number="1">
<Ratio>3.364</Ratio>
<MaxTorque>1900</MaxTorque>
@@ -112,7 +111,7 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
</Data>
</Transmission>
<Axlegear>
- <Data xsi:type="AxlegearDataPIFType">
+ <Data xsi:type="AxlegearDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic primary bus 41 AxleGear</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -123,9 +122,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
</Data>
</Axlegear>
<AxleWheels>
- <Data xsi:type="AxleWheelsDataPIFType">
+ <Data xsi:type="AxleWheelsDataVIFType">
<Axles>
- <vif0.1:Axle axleNumber="1" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <vif:Axle axleNumber="1" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>true</Steered>
@@ -151,8 +150,8 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
</di:Reference>
</Signature>
</Tyre>
- </vif0.1:Axle>
- <vif0.1:Axle axleNumber="2" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ </vif:Axle>
+ <vif:Axle axleNumber="2" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<AxleType>VehicleDriven</AxleType>
<TwinTyres>true</TwinTyres>
<Steered>false</Steered>
@@ -178,12 +177,12 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
</di:Reference>
</Signature>
</Tyre>
- </vif0.1:Axle>
+ </vif:Axle>
</Axles>
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xmlns:aux="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xsi:type="AuxiliaryDataPIFType">
+ <Data xsi:type="AUX_Conventional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -235,7 +234,7 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Results>
<Status>success</Status>
<Result status="success">
- <VehicleGroup>P31SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
@@ -246,10 +245,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">20.73851</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1520.18</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P31SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
@@ -260,10 +258,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">24.94611</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1828.60</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P31SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
@@ -274,10 +271,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">16.93598</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1241.44</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P31SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
@@ -288,10 +284,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">20.36950</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1493.13</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P31SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
@@ -302,10 +297,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">15.03487</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1102.09</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P31SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
@@ -316,10 +310,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">18.14589</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1330.13</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P31SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">12854.90</TotalVehicleMass>
@@ -330,10 +323,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">12.90679</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">946.09</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P31SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15494.61</TotalVehicleMass>
@@ -344,10 +336,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">14.34621</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1051.61</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P31DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
@@ -358,10 +349,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">21.81903</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1599.38</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P31DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
@@ -372,10 +362,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">26.59833</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1949.71</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P31DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
@@ -386,10 +375,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">17.82311</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1306.47</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P31DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
@@ -400,10 +388,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">21.69768</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1590.49</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P31DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
@@ -414,10 +401,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">15.74932</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1154.46</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P31DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
@@ -428,10 +414,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">19.17775</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1405.77</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P32SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">14225.44</TotalVehicleMass>
@@ -442,10 +427,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.19757</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">967.41</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P32SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16669.61</TotalVehicleMass>
@@ -456,10 +440,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">14.54412</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1066.11</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P32SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">14244.99</TotalVehicleMass>
@@ -470,10 +453,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.13867</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">816.49</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P32SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15887.48</TotalVehicleMass>
@@ -484,10 +466,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.58643</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">849.31</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P32DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">14662.82</TotalVehicleMass>
@@ -498,10 +479,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.62230</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">998.54</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P32DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">17609.41</TotalVehicleMass>
@@ -512,10 +492,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">15.22020</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1115.67</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P32DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">14747.01</TotalVehicleMass>
@@ -526,10 +505,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.61807</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">851.63</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P32DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16767.53</TotalVehicleMass>
@@ -540,7 +518,6 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">12.15012</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">890.63</CO2>
</Result>
</Results>
<ApplicationInformation>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_VIF.xml
index 6705787dfde9bb453036f6c3410b59645f40bc9c..65e0097fe1b5ddf4cc66a9dba38794c2838219c9 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_VIF.xml
@@ -28,7 +28,7 @@
<tcl:Entry gear="6" maxTorque="1800"/>
<tcl:Entry gear="1" maxTorque="2500"/>
</TorqueLimits>
- <Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
+ <Components xsi:type="VehicleComponentsPIFType">
<Engine>
<Data xsi:type="EngineDataPIFType">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
index 885a68d120869ff7139f0beb4ce399def5396f12..d16ce1bf321ff8070095cc4415f3fca9faca71e6 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<VectoOutputMultistep xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
<PrimaryVehicle>
<Data id="VEH-dda89003b1894b738e01" xsi:type="PrimaryVehicleDataType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
- <Vehicle xsi:type="VehiclePIFType">
- <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
- <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+ <Vehicle xsi:type="ConventionalVehicleVIFType">
+ <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model Primary</Model>
<VIN>VEH-1234567890_SmartPS</VIN>
<Date>2017-02-15T11:00:00Z</Date>
@@ -31,7 +31,7 @@
</vif0.1:TorqueLimits>
<Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
<Engine>
- <Data xsi:type="EngineDataPIFType">
+ <Data xsi:type="EngineDataVIFType">
<Manufacturer>Generic Engine Manufacturer Primary</Manufacturer>
<Model>Bus 6x2 Engine</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -42,9 +42,9 @@
<RatedPower>325032</RatedPower>
<MaxEngineTorque>2134</MaxEngineTorque>
<WHRType>
- <v2.3:MechanicalOutputICE>false</v2.3:MechanicalOutputICE>
- <v2.3:MechanicalOutputDrivetrain>false</v2.3:MechanicalOutputDrivetrain>
- <v2.3:ElectricalOutput>false</v2.3:ElectricalOutput>
+ <MechanicalOutputICE>false</MechanicalOutputICE>
+ <MechanicalOutputDrivetrain>false</MechanicalOutputDrivetrain>
+ <ElectricalOutput>false</ElectricalOutput>
</WHRType>
<Mode>
<IdlingSpeed>600</IdlingSpeed>
@@ -67,14 +67,14 @@
</Data>
</Engine>
<Transmission>
- <Data xsi:type="TransmissionDataPIFType">
+ <Data xsi:type="TransmissionDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer Primary</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox Primary</Model>
<MainCertificationMethod>Standard values</MainCertificationMethod>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
- <Gears xsi:type="TransmissionGearsPIFType">
+ <Gears xsi:type="TransmissionGearsVIFType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
@@ -128,7 +128,7 @@
</Data>
</Transmission>
<Axlegear>
- <Data xsi:type="AxlegearDataPIFType">
+ <Data xsi:type="AxlegearDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear Primary</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -139,7 +139,7 @@
</Data>
</Axlegear>
<AxleWheels>
- <Data xsi:type="AxleWheelsDataPIFType">
+ <Data xsi:type="AxleWheelsDataVIFType">
<Axles>
<Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
<v2.0:AxleType>VehicleNonDriven</v2.0:AxleType>
@@ -226,7 +226,7 @@
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataPIFType">
+ <Data xsi:type="AUX_Conventional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -277,7 +277,7 @@
<Results>
<Status>success</Status>
<Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
@@ -288,10 +288,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">21.18710</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1553.06</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
@@ -302,10 +301,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">25.36235</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1859.11</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
@@ -316,10 +314,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">16.73089</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1226.41</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
@@ -330,10 +327,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">20.22898</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1482.83</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
@@ -344,10 +340,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">14.37825</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1053.96</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
@@ -358,10 +353,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">17.62230</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1291.75</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15469.51</TotalVehicleMass>
@@ -372,10 +366,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.83195</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">867.31</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">18411.57</TotalVehicleMass>
@@ -386,10 +379,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.25049</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">971.29</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
@@ -400,10 +392,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">22.69048</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1663.26</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
@@ -414,10 +405,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">27.91380</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">2046.14</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
@@ -428,10 +418,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">17.89886</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1312.02</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
@@ -442,10 +431,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">22.22866</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1629.41</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
@@ -456,10 +444,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">15.31725</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1122.79</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
@@ -470,10 +457,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">19.28148</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1413.37</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16467.68</TotalVehicleMass>
@@ -484,10 +470,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.94624</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">875.68</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">19319.21</TotalVehicleMass>
@@ -498,10 +483,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.32545</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">976.78</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34SD</PrimaryVehicleSubgroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16490.49</TotalVehicleMass>
@@ -512,10 +496,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">8.71857</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">639.09</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34SD</PrimaryVehicleSubgroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">18406.72</TotalVehicleMass>
@@ -526,10 +509,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">9.20204</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">674.53</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34DD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">19588.08</TotalVehicleMass>
@@ -540,10 +522,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.58782</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">996.02</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34DD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">23643.60</TotalVehicleMass>
@@ -554,10 +535,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">15.57745</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1141.86</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34DD</PrimaryVehicleSubgroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">19703.95</TotalVehicleMass>
@@ -568,10 +548,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">9.82883</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">720.47</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34DD</PrimaryVehicleSubgroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">22484.88</TotalVehicleMass>
@@ -582,7 +561,6 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">10.56696</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">774.58</CO2>
</Result>
</Results>
<ApplicationInformation>
diff --git a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv24.cs b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv24.cs
index 7d2257ceb65f3d0c2c48462d9314ca3adfd967df..0e72bbc6200a1327cd792af66c7c90397e86afc9 100644
--- a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv24.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv24.cs
@@ -2055,7 +2055,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(1, eMachine.Count);
Assert.AreEqual(ElectricMachineType.ASM, eMachine.ElectricMachine.ElectricMachineType);
- Assert.AreEqual(1.SI<Watt>(), eMachine.ElectricMachine.R85RatedPower);
+ Assert.AreEqual(50000.SI<Watt>(), eMachine.ElectricMachine.R85RatedPower);
Assert.AreEqual(0.10.SI<KilogramSquareMeter>(), eMachine.ElectricMachine.Inertia);
Assert.AreEqual(true, eMachine.ElectricMachine.DcDcConverterIncluded);
Assert.AreEqual("IHPC Type 1", eMachine.ElectricMachine.IHPCType);
diff --git a/VectoMockup/VectoMockup/MockupModalDataContainer.cs b/VectoMockup/VectoMockup/MockupModalDataContainer.cs
index c5ddedd060b2972d1097bbf27746368bb0c35f82..01bcdb7aff02138146654d41c133617a5c66462a 100644
--- a/VectoMockup/VectoMockup/MockupModalDataContainer.cs
+++ b/VectoMockup/VectoMockup/MockupModalDataContainer.cs
@@ -6,6 +6,7 @@ using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.Simulation.Impl;
+using TUGraz.VectoCore.Models.SimulationComponent;
using TUGraz.VectoCore.OutputData;
namespace TUGraz.VectoMockup
@@ -185,10 +186,10 @@ namespace TUGraz.VectoMockup
_modalDataContainerImplementation.CalculateAggregateValues();
}
- public void AddElectricMotor(PowertrainPosition pos)
- {
- _modalDataContainerImplementation.AddElectricMotor(pos);
- }
+ //public void AddElectricMotor(PowertrainPosition pos)
+ //{
+ // _modalDataContainerImplementation.AddElectricMotor(pos);
+ //}
public KilogramPerWattSecond VehicleLineSlope(IFuelProperties fuel)
{
@@ -278,6 +279,15 @@ namespace TUGraz.VectoMockup
}
public ICorrectedModalData CorrectedModalData => _modalDataContainerImplementation.CorrectedModalData;
+ public void RegisterComponent(VectoSimulationComponent component)
+ {
+ throw new NotImplementedException();
+ }
+
+ public bool ContainsColumn(string modalResultField)
+ {
+ throw new NotImplementedException();
+ }
#endregion
}
diff --git a/VectoMockup/VectoMockup/Simulation/SimulatorFactory/MockupSimulatorFactories.cs b/VectoMockup/VectoMockup/Simulation/SimulatorFactory/MockupSimulatorFactories.cs
index 90fb473ab9f05bfa336bcb2670d8c783fd8ec312..67d747fd31aa886b18a2d53387e066d7fa59e2cd 100644
--- a/VectoMockup/VectoMockup/Simulation/SimulatorFactory/MockupSimulatorFactories.cs
+++ b/VectoMockup/VectoMockup/Simulation/SimulatorFactory/MockupSimulatorFactories.cs
@@ -77,7 +77,7 @@ namespace TUGraz.VectoMockup.Simulation.SimulatorFactory
});
}
- protected override IVectoRun GetNonExemptedRun(VectoRunData data, int current, VectoRunData d, ref bool warning1Hz)
+ protected override IVectoRun GetNonExemptedRun(VectoRunData data, int current, VectoRunData d, ref bool warning1Hz, ref bool firstRun)
{
var addReportResult = PrepareReport(data);
return new MockupRun(new VehicleContainer(ExecutionMode.Declaration,